275 files changed, 105812 insertions, 38207 deletions

diff --git a/.gitignore b/.gitignore
index f5a3e0212..83a53dfa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,15 @@
 avatar/*
 files/*
 _darcs/*
+logs/*
 config.php
 .htaccess
+httpd.conf
 *.tmproj
 dataobject.ini
 *~
 *.bak
 *.orig
 *.rej
+.#*
+*.swp
diff --git a/EVENTS.txt b/EVENTS.txt
new file mode 100644
index 000000000..5edf59245
--- /dev/null
+++ b/EVENTS.txt
@@ -0,0 +1,105 @@
+InitializePlugin: a chance to initialize a plugin in a complete
+		  environment
+
+CleanupPlugin: a chance to cleanup a plugin at the end of a program
+
+StartPrimaryNav: Showing the primary nav menu
+- $action: the current action
+
+EndPrimaryNav: At the end of the primary nav menu
+- $action: the current action
+
+StartSecondaryNav: Showing the secondary nav menu
+- $action: the current action
+
+EndSecondaryNav: At the end of the secondary nav menu
+- $action: the current action
+
+StartShowStyles: Showing Style links; good place to add UA style resets
+- $action: the current action
+
+EndShowStyles: End showing Style links; good place to add custom styles
+- $action: the current action
+
+StartShowLaconicaStyles: Showing Laconica Style links
+- $action: the current action
+
+EndShowLaconicaStyles: End showing Laconica Style links;  good place to add handheld or JavaScript dependant styles
+- $action: the current action
+
+StartShowUAStyles: Showing custom UA Style links
+- $action: the current action
+
+EndShowUAStyles: End showing custom UA Style links; good place to add user-agent (e.g., filter, -webkit, -moz) specific styles
+- $action: the current action
+
+StartShowScripts: Showing JavaScript links
+- $action: the current action
+
+EndShowScripts: End showing JavaScript links; good place to add custom
+		links like Google Analytics
+- $action: the current action
+
+StartShowJQueryScripts: Showing JQuery script links (use this to link to e.g. Google mirrors)
+- $action: the current action
+
+EndShowJQueryScripts: End showing JQuery script links
+- $action: the current action
+
+StartShowLaconicaScripts: Showing Laconica script links (use this to link to a CDN or something)
+- $action: the current action
+
+EndShowLaconicaScripts: End showing Laconica script links
+- $action: the current action
+
+StartShowSections: Start the list of sections in the sidebar
+- $action: the current action
+
+EndShowSections: End the list of sections in the sidebar
+- $action: the current action
+
+StartShowHeader: Showing before the header container
+- $action: the current action
+
+EndShowHeader: Showing after the header container
+- $action: the current action
+
+StartShowFooter: Showing before the footer container
+- $action: the current action
+
+EndShowFooter: Showing after the footer container
+- $action: the current action
+
+StartShowContentBlock: Showing before the content container
+- $action: the current action
+
+EndShowContentBlock: Showing after the content container
+- $action: the current action
+
+StartNoticeSave: before inserting a notice (good place for content filters)
+- $notice: notice being saved (no ID or URI)
+
+EndNoticeSave: after inserting a notice and related code
+- $notice: notice that was saved (with ID and URI)
+
+StartShowLocalNavBlock: Showing the local nav menu
+- $action: the current action
+
+EndShowLocalNavBlock: At the end of the local nav menu
+- $action: the current action
+
+StartShowHTML: Chance to set document headers (e.g., content type, charset, language), DOCTYPE and html element properties
+- $action: the current action
+
+EndShowHTML: Showing after the html element
+- $action: the current action
+
+StartPublicGroupNav: Showing the public group nav menu
+- $action: the current action
+
+EndPublicGroupNav: At the end of the public group nav menu
+- $action: the current action
+
+RouterInitialized: After the router instance has been initialized
+- $m: the Net_URL_Mapper that has just been set up
+
diff --git a/README b/README
index a0758e5ee..388d67ed2 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
 README
 ------
 
-Laconica 0.6.4 ("Catapult")
-11 December 2008
+Laconica 0.7.1 ("West of the Fields")
+6 February 2009
 
 This is the README file for Laconica, the Open Source microblogging
 platform. It includes installation instructions, descriptions of
@@ -19,23 +19,23 @@ microblogging platform. It helps people in a community, company or
 group to exchange short (140 character) messages over the Web. Users
 can choose which people to "follow" and receive only their friends' or
 colleagues' status messages. It provides a similar service to sites
-like Twitter, Jaiku, Pownce and Plurk.
+like Twitter, Jaiku and Plurk.
 
 With a little work, status messages can be sent to mobile phones,
 instant messenger programs (GTalk/Jabber), and specially-designed
 desktop clients that support the Twitter API.
 
 Laconica supports an open standard called OpenMicroBlogging
-(http://openmicroblogging.org/) that lets users on different Web sites
+<http://openmicroblogging.org/> that lets users on different Web sites
 or in different companies subscribe to each others' notices. It
 enables a distributed social network spread all across the Web.
 
 Laconica was originally developed for the Open Software Service,
-Identi.ca (http://identi.ca/). It is shared with you in hope that you
+Identi.ca <http://identi.ca/>. It is shared with you in hope that you
 too make an Open Software Service available to your users. To learn
-more, please see the Open Software Service Definition 1.0:
+more, please see the Open Software Service Definition 1.1:
 
-      http://www.openknowledge.org/ossd
+      http://www.opendefinition.org/ossd
 
 License
 =======
@@ -71,56 +71,54 @@ for additional terms.
 New this version
 ================
 
-This is a minor feature and security improvement version from version
-0.6.3 (release 24 Nov 2008). Notable features of version 0.6.4 include:
-
-- "private" installs won't show any data to the outside world; redirect
-  non-logged-in users to login. (See "Private" below)
-- Ability to "block" a subscriber, which forces them to unsubscribe,
-  doesn't allow them to subscribe again, and doesn't allow them to send
-  @-replies
-- Fine-grained control of subscriptions; users can choose not to receive
-  notices from other users over SMS, or IM, or both
-- support for Mozilla microsummaries
-  (https://wiki.mozilla.org/Microsummaries)
-- more efficient support for blacklisting users from the public page
-- instructions on the public page for people who aren't logged in
-- better registration instructions
-- a check for license compatibility in receiving OMB notices
-- HTML output in RSS 1.0, 2.0, and Atom feeds
-- tuned and more reliable 'rememberme' cookies for username/password
-  and OpenID logins
-- a utility for setting user passwords
-- a "ban" configuration variable to ban certain users from posting
-  notices
-- an configurable posting throttle to keep any one user from flooding
-  the site with messages.
-- fine-tuned url-shortening: only shorten if it's needed, only expand
-  certain URLs, and handle failure of URL-shortening services reliably
-- disable Ajax input for notices, subscribe, nudge, while the
-  request is processing
-- early implementation of support for Last-Modified and ETag-based
-  caching
-- initial microformats support
-- redirect on bad nicknames in URLs
-- correctly send emails in recipient's, not sender's, language
-- correct email content type
-- Change "Most Favorited" page to "Popular"
-- properly support the "since" parameter in API calls
-- Fix for changes in validate_credentials API call for the Twitter
-  bridge
-- Fix for fatal error when sending email confirmation on registration
-- Better replies for commands sent through the Ajax channel
-- Add a User-Agent string for OMB requests
-- Upgrade upstream library XMPPHP
-- Upgrade upstream library JQuery Forms
-- Code cleanup: checkboxes have proper <label> elements
-- Code cleanup: consolidated various notice-listing code in one place
-- Better support for unsubscribing from a remote user
-- Stump of experimental Facebook application (not ready for use! code
-  review only!)
-- Stump of experimental user account deletion (not ready for use! code
-  review only!)
+This is a minor bug-fix release since version 0.7.0, released Jan 29
+2009. Notable changes this version:
+
+- Vast improvement in auto-linking to URLs.
+- Link to group search from user's group page
+- Improved interface in Facebook application
+- Fix bad redirects in delete notice
+- Updated PostgreSQL database creation script
+- Show filesize in avatar/logo upload
+- Vastly improved avatar/logo upload
+- Allow re-authentication with OpenID
+- Correctly link hashtabs inside parens and brackets
+- Group and avatar image transparency works
+- Better handling of commands through the Web and Ajax channels
+- Fix links for profile page feeds
+- Fixed destroy method in API
+- Fix endpoint of Connect menu when XMPP disabled
+- Show number of group members
+- Enable configuration files in /etc/laconica/
+
+Changes in version 0.7.0:
+
+- Support for groups. Users can join groups and send themed notices
+  to those groups. All other members of the group receive the notices.
+- Laconica-specific extensions to the Twitter API.
+- A Facebook application.
+- A massive UI redesign. The HTML generated by Laconica has changed
+  significantly, to make theming easier and to give a more open look
+  by default. Also, sidebar.
+- Massive code hygiene changes to move towards compliance with the PEAR
+  coding standards and to support the new UI redesign.
+- Began the breakup of util.php -- moved about 30% of code to a views
+  hierarchy.
+- UI elements for statistical information (like top posters or most
+  popular groups) added in a sidebar.
+- include Javascript badge by Kent Brewster.
+- Updated online documentation.
+- Cropping of user avatars using Jcrop.
+- fix for Twitter bridge to not send "Expect:" headers.
+- add 'dm' as a synonym for 'd' in commands.
+- Upgrade upstream version of jQuery to 1.3.
+- Upgrade upstream version of PHP-OpenID to 2.1.2.
+- Move OpenMicroBlogging specification to its own repository.
+- Make tag-based RSS streams work.
+- Additional locales: Bulgarian, Catalan, Greek, Hebrew, simplified
+  Chinese, Telugu, Taiwanese Chinese, Vietnamese,
+- PostgreSQL updates.
+- Nasty bug in Twitter bridge that wouldn't verify with Twitter
 
 Prerequisites
 =============
@@ -202,6 +200,7 @@ and the URLs are listed here for your convenience.
   version (patches have been submitted). Upgrading to the upstream
   version may render your Laconica site unable to send or receive XMPP
   messages.
+- Facebook library. Used for the Facebook application.
 
 A design goal of Laconica is that the basic Web functionality should
 work on even the most restrictive commercial hosting services.
@@ -219,9 +218,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 laconica-0.6.4.tar.gz
+   	   tar zxf laconica-0.7.1.tar.gz
 
-   ...which will make a laconica-0.6.4 subdirectory in your current
+   ...which will make a laconica-0.7.1 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.)
@@ -229,7 +228,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 laconica-0.6.4 /var/www/mublog
+   	   mv laconica-0.7.1 /var/www/mublog
 
    This will make your Laconica instance available in the mublog path of
    your server, like "http://example.net/mublog". "microblog" or
@@ -237,21 +236,28 @@ especially if you've previously installed PHP/MySQL packages.
    configure virtual hosts on your web server, you can try setting up
    "http://micro.example.net/" or the like.
 
-3. You should also take this moment to make your avatar subdirectory
-   writeable by the Web server. An insecure way to do this is:
+3. Make your target directory writeable by the Web server.
 
-   	  chmod a+w /var/www/mublog/avatar
+   	  chmod a+w /var/www/mublog/
 
    On some systems, this will probably work:
 
-      	   chgrp www-data /var/www/mublog/avatar
-	   chmod g+w /var/www/mublog/avatar
+      	   chgrp www-data /var/www/mublog/
+	   chmod g+w /var/www/mublog/
 
    If your Web server runs as another user besides "www-data", try
    that user's default group instead. As a last resort, you can create
-   a new group like "avatar" and add the Web server's user to the group.
+   a new group like "mublog" and add the Web server's user to the group.
+
+4. You should also take this moment to make your avatar subdirectory
+   writeable by the Web server. An insecure way to do this is:
+
+   	  chmod a+w /var/www/mublog/avatar
+
+   You can also make the avatar directory writeable by the Web server
+   group, as noted above.
 
-4. Create a database to hold your microblog data. Something like this
+5. Create a database to hold your microblog data. Something like this
    should work:
 
    	  mysqladmin -u "username" --password="password" create laconica
@@ -264,63 +270,55 @@ especially if you've previously installed PHP/MySQL packages.
    a tool like PHPAdmin to create a database. Check your hosting
    service's documentation for how to create a new MySQL database.)
 
-5. Run the laconica.sql SQL script in the db subdirectory to create
-   the database tables in the database. A typical system would work
-   like this:
-
-   	  mysql -u "username" --password="password" laconica < /var/www/mublog/db/laconica.sql
-
-   You may want to test by logging into the database and checking that
-   the tables were created. Here's an example:
-
-          SHOW TABLES;
-
 6. Create a new database account that Laconica will use to access the
    database. If you have shell access, this will probably work from the
    MySQL shell:
 
-          GRANT SELECT,INSERT,DELETE,UPDATE on laconica.*
+          GRANT ALL on laconica.*
 	  TO 'lacuser'@'localhost'
 	  IDENTIFIED BY 'lacpassword';
 
    You should change 'lacuser' and 'lacpassword' to your preferred new
-   username and password. You may want to test logging in as this new
-   user and testing that you can SELECT from some of the tables in the
-   DB (use SHOW TABLES to see which ones are there).
-
-7. Copy the config.php.sample in the Laconica directory to config.php.
-
-8. Edit config.php to set the basic configuration for your system.
-   (See descriptions below for basic config options.) Note that there
-   are lots of options and if you try to do them all at once, you will
-   have a hard time making sure what's working and what's not. So,
-   stick with the basics at first. In particular, customizing the
-   'site' and 'db' settings will almost definitely be needed.
-
-9. At this point, you should be able to navigate in a browser to your
-   microblog's main directory and see the "Public Timeline", which
-   will be empty. If not, magic has happened! You can now register a
-   new user, post some notices, edit your profile, etc. However, you
-   may want to wait to do that stuff if you think you can set up
-   "fancy URLs" (see below), since some URLs are stored in the database.
+   username and password. You may want to test logging in to MySQL as
+   this new user.
+
+7. In a browser, navigate to the Laconica install script; something like:
+
+           http://yourserver.example.com/mublog/install.php
+
+   Enter the database connection information and your site name. The
+   install program will configure your site and install the initial,
+   almost-empty database.
+
+8. You should now be able to navigate to your microblog's main directory
+   and see the "Public Timeline", which will be empty. If not, magic
+   has happened! You can now register a new user, post some notices,
+   edit your profile, etc. However, you may want to wait to do that stuff
+   if you think you can set up "fancy URLs" (see below), since some
+   URLs are stored in the database.
 
 Fancy URLs
 ----------
 
-By default, Laconica will have big long sloppy URLs that are hard for
-people to remember or use. For example, a user's home profile might be
+By default, Laconica will use URLs that include the main PHP program's
+name in them. For example, a user's home profile might be
 found at:
 
-    http://example.org/mublog/index.php?action=showstream&nickname=fred
+    http://example.org/mublog/index.php/mublog/fred
+
+On certain systems that don't support this kind of syntax, they'll
+look like this:
+
+    http://example.org/mublog/index.php?p=mublog/fred
 
 It's possible to configure the software so it looks like this instead:
 
     http://example.org/mublog/fred
 
 These "fancy URLs" are more readable and memorable for users. To use
-fancy URLs, you must either have Apache 2.2.x with .htaccess enabled
-and mod_redirect enabled, -OR- know how to configure "url redirection"
-in your server.
+fancy URLs, you must either have Apache 2.x with .htaccess enabled and
+mod_redirect enabled, -OR- know how to configure "url redirection" in
+your server.
 
 1. Copy the htaccess.sample file to .htaccess in your Laconica
    directory. Note: if you have control of your server's httpd.conf or
@@ -345,10 +343,6 @@ like:
 If you changed your HTTP server configuration, you may need to restart
 the server first.
 
-If you have problems with the .htaccess file on versions of Apache
-earlier than 2.2.x, try changing the regular expressions in the
-htaccess.sample file that use "\w" to just use ".".
-
 Sphinx
 ------
 
@@ -380,7 +374,7 @@ configuration is essentially email configuration.
 Each user sends to a made-up email address, which they keep a secret.
 Incoming email that is "From" the user's SMS email address, and "To"
 the users' secret email address on the site's domain, will be
-converted to a message and stored in the DB.
+converted to a notice and stored in the DB.
 
 For this to work, there *must* be a domain or sub-domain for which all
 (or most) incoming email can pass through the incoming mail filter.
@@ -424,7 +418,7 @@ config.php, and access to the Laconica database from the mail server.
 XMPP
 ----
 
-XMPP (eXtended Message and Presence Protocol, http://xmpp.org/) is the
+XMPP (eXtended Message and Presence Protocol, <http://xmpp.org/>) is the
 instant-messenger protocol that drives Jabber and GTalk IM. You can
 distribute messages via XMPP using the system below; however, you
 need to run the XMPP incoming daemon to allow incoming messages as
@@ -508,7 +502,7 @@ server is probably a good idea for high-volume sites.
    needs as a parameter the install path; if you run it from the
    Laconica dir, "." should suffice.
 
-This will run six (for now) queue handlers:
+This will run eight (for now) queue handlers:
 
 * xmppdaemon.php - listens for new XMPP messages from users and stores
   them as notices in the database.
@@ -522,6 +516,10 @@ This will run six (for now) queue handlers:
   of registered users.
 * xmppconfirmhandler.php - sends confirmation messages to registered
   users.
+* twitterqueuehandler.php - sends queued notices to Twitter for user
+  who have opted to set up Twitter bridging.
+* facebookqueuehandler.php - sends queued notices to Facebook for users
+  of the built-in Facebook application.
 
 Note that these queue daemons are pretty raw, and need your care. In
 particular, they leak memory, and you may want to restart them on a
@@ -554,10 +552,57 @@ Sample cron job:
 # Update Twitter friends subscriptions every half hour
 0,30 * * * * /path/to/php /path/to/laconica/scripts/synctwitterfriends.php>&/dev/null
 
+Built-in Facebook Application
+-----------------------------
+
+Laconica's Facebook application allows your users to automatically
+update their Facebook statuses with their latest notices, invite
+their friends to use the app (and thus your site), view their notice
+timelines, and post notices -- all from within Facebook. The application
+is built into Laconica and runs on your host.  For automatic Facebook
+status updating to work you will need to enable queuing and run the
+facebookqueuehandler.php daemon (see the "Queues and daemons" section
+above).
+
+Quick setup instructions*:
+
+Install the Facebook Developer application on Facebook:
+
+    http://www.facebook.com/developers/
+
+Use it to create a new application and generate an API key and secret.
+Uncomment the Facebook app section of your config.php and copy in the
+key and secret, e.g.:
+
+    # Config section for the built-in Facebook application
+    $config['facebook']['apikey'] = 'APIKEY';
+    $config['facebook']['secret'] = 'SECRET';
+
+In Facebook's application editor, specify the following URLs for your app:
+
+- Callback URL: http://example.net/mublog/facebook/
+- Post-Remove URL: http://example.net/mublog/facebook/remove
+- Post-Add Redirect URL: http://apps.facebook.com/yourapp/
+- Canvas URL: http://apps.facebook.com/yourapp/
+
+(Replace 'example.net' with your host's URL, 'mublog' with the path
+to your Laconica installation, and 'yourapp' with the name of the
+Facebook application you created.)
+
+Additionally, Choose "Web" for Application type in the Advanced tab.
+In the "Canvas setting" section, choose the "FBML" for Render Method,
+"Smart Size" for IFrame size, and "Full width (760px)" for Canvas Width.
+Everything else can be left with default values.
+
+*For more detailed instructions please see the installation guide on the
+Laconica wiki:
+
+    http://laconi.ca/trac/wiki/FacebookApplication
+
 Sitemaps
 --------
 
-Sitemap files (http://sitemaps.org/) are a very nice way of telling
+Sitemap files <http://sitemaps.org/> are a very nice way of telling
 search engines and other interested bots what's available on your site
 and what's changed recently. You can generate sitemap files for your
 Laconica instance.
@@ -578,7 +623,7 @@ Laconica instance.
    like './sitemapindex.xml'. sitemap-directory is the directory where
    you want the sitemaps stored, like './sitemaps/' (make sure the dir
    exists). URL-prefix-for-sitemaps is the full URL for the sitemap dir,
-   typically something like 'http://example.net/mublog/sitemaps/'.
+   typically something like <http://example.net/mublog/sitemaps/>.
 
 You can use several methods for submitting your sitemap index to
 search engines to get your site indexed. One is to add a line like the
@@ -594,7 +639,7 @@ to these resources.
 Themes
 ------
 
-There are two themes shipped with this version of Laconica: "stoica",
+There are two themes shipped with this version of Laconica: "identica",
 which is what the Identi.ca site uses, and "default", which is a good
 basis for other sites.
 
@@ -625,16 +670,20 @@ default-avatar-mini.png: Ditto ditto, but 24x24. For subscriptions
 You may want to start by copying the files from the default theme to
 your own directory.
 
+NOTE: the HTML generated by Laconica changed *radically* between
+version 0.6.x and 0.7.x. Older themes will need signification
+modification to use the new output format.
+
 Translation
 -----------
 
-Translations in Laconica use the gettext system (http://www.gnu.org/software/gettext/).
+Translations in Laconica use the gettext system <http://www.gnu.org/software/gettext/>.
 Theoretically, you can add your own sub-directory to the locale/
 subdirectory to add a new language to your system. You'll need to
 compile the ".po" files into ".mo" files, however.
 
 Contributions of translation information to Laconica are very easy:
-you can use the Web interface at http://laconi.ca/entrans/ to add one
+you can use the Web interface at http://laconi.ca/pootle/ to add one
 or a few or lots of new translations -- or even new languages. You can
 also download more up-to-date .po files there, if you so desire.
 
@@ -643,7 +692,7 @@ Backups
 
 There is no built-in system for doing backups in Laconica. You can make
 backups of a working Laconica system by backing up the database and
-the Web directory. To backup the database use mysqldump (http://ur1.ca/7xo)
+the Web directory. To backup the database use mysqldump <http://ur1.ca/7xo>
 and to backup the Web directory, try tar.
 
 Private
@@ -669,7 +718,7 @@ Upgrading
 If you've been using Laconica 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 Laconica 0.6.4. Try these step-by-step instructions; read
+procedure in Laconica 0.7.1. Try these step-by-step instructions; read
 to the end first before trying them.
 
 0. Download Laconica and set up all the prerequisites as if you were
@@ -761,6 +810,15 @@ edit any other file in the directory, like lib/common.php (where most
 of the defaults are defined), you will lose your configuration options
 in any upgrade, and you will wish that you had been more careful.
 
+Starting with version 0.7.1, you can put config files in the
+/etc/laconica/ directory on your server, if it exists. Config files
+will be included in this order:
+
+* /etc/laconica/laconica.php - server-wide config
+* /etc/laconica/<servername>.php - for a virtual host
+* /etc/laconica/<servername>_<pathname>.php - for a path
+* INSTALLDIR/config.php - for a particular implementation
+
 Almost all configuration options are made through a two-dimensional
 associative array, cleverly named $config. A typical configuration
 line will be:
@@ -826,7 +884,7 @@ db
 --
 
 This section is a reference to the configuration options for
-DB_DataObject (see http://ur1.ca/7xp). The ones that you may want to
+DB_DataObject (see <http://ur1.ca/7xp>). The ones that you may want to
 set are listed below for clarity.
 
 database: a DSN (Data Source Name) for your Laconica database. This is
@@ -926,7 +984,7 @@ server: If set, defines another server where avatars are stored in the
 	the client to speed up page loading, either with another
 	virtual server or with an NFS or SAMBA share. Clients
 	typically only make 2 connections to a single server at a
-	time (http://ur1.ca/6ih), so this can parallelize the job.
+	time <http://ur1.ca/6ih>, so this can parallelize the job.
 	Defaults to null.
 
 public
@@ -1007,7 +1065,7 @@ memcached
 ---------
 
 You can get a significant boost in performance by caching some
-database data in memcached (http://www.danga.com/memcached/).
+database data in memcached <http://www.danga.com/memcached/>.
 
 enabled: Set to true to enable. Default false.
 server: a string with the hostname of the memcached server. Can also
@@ -1018,7 +1076,7 @@ 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/).
+<http://sphinxsearch.com/>.
 
 enabled: Set to true to enable. Default false.
 server: a string with the hostname of the sphinx server.
@@ -1031,7 +1089,7 @@ A catch-all for integration with other systems.
 
 source: The name to use for the source of posts to Twitter. Defaults
 	to 'laconica', but if you request your own source name from
-	Twitter (http://twitter.com/help/request_source), you can use
+	Twitter <http://twitter.com/help/request_source>, you can use
 	that here instead. Status updates on Twitter will then have
 	links to your site.
 
@@ -1077,7 +1135,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 Laconica 0.6.4 without reading the "Notice inboxes"
+If you upgraded to Laconica 0.7.1 without reading the "Notice inboxes"
 section above, and all your users' 'Personal' tabs are empty, read the
 "Notice inboxes" section above.
 
@@ -1108,7 +1166,7 @@ Unstable version
 
 If you're adventurous or impatient, you may want to install the
 development version of Laconica. To get it, use the git version
-control tool (http://git-scm.com/) like so:
+control tool <http://git-scm.com/> like so:
 
 	git clone http://laconi.ca/software/laconica.git
 
@@ -1121,7 +1179,7 @@ There are several ways to get more information about Laconica.
 
 * There is a mailing list for Laconica developers and admins at
   http://mail.laconi.ca/mailman/listinfo/laconica-dev
-* The #laconica IRC channel on freenode.net (http://www.freenode.net/).
+* The #laconica IRC channel on freenode.net <http://www.freenode.net/>.
 * The Laconica wiki, http://laconi.ca/trac/
 
 Feedback
@@ -1156,9 +1214,13 @@ if anyone's been overlooked in error.
 * Erik Stambaugh
 * 'drry'
 * Gina Haeussge
-* Ken Sheppardson (Trac server, man-about-town)
-* Tiago 'gouki' Faria (entrans)
 * Tryggvi Björgvinsson
+* Adrian Lang
+* Ori Avtalion
+* Meitar Moscovitz
+* Ken Sheppardson (Trac server, man-about-town)
+* Tiago 'gouki' Faria (i18n managerx)
+* Sean Murphy
 
 Thanks also to the developers of our upstream library code and to the
 thousands of people who have tried out Identi.ca, installed Laconi.ca,
diff --git a/actions/all.php b/actions/all.php
index 428466f24..08dcccbdd 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -42,6 +42,9 @@ class AllAction extends Action
         if (!$this->page) {
             $this->page = 1;
         }
+
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
@@ -66,13 +69,22 @@ class AllAction extends Action
         }
     }
 
-    function showFeeds()
+    function getFeeds()
     {
-        $this->element('link', array('rel' => 'alternate',
-                                     'href' => common_local_url('allrss', array('nickname' =>
-                                                                                $this->user->nickname)),
-                                     'type' => 'application/rss+xml',
-                                     'title' => sprintf(_('Feed for friends of %s'), $this->user->nickname)));
+        return array(new Feed(Feed::RSS1,
+                              common_local_url('allrss', array('nickname' =>
+                                                               $this->user->nickname)),
+                              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',
+                                                            'argument' => $this->user->nickname.'.rss')),
+                              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',
+                                                            'argument' => $this->user->nickname.'.atom')),
+                              sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname)));
     }
 
     function showLocalNav()
@@ -81,15 +93,6 @@ class AllAction extends Action
         $nav->show();
     }
 
-    function showExportData()
-    {
-        $fl = new FeedList($this);
-        $fl->show(array(0=>array('href'=>common_local_url('allrss', array('nickname' => $this->user->nickname)),
-                                 'type' => 'rss',
-                                 'version' => 'RSS 1.0',
-                                 'item' => 'allrss')));
-    }
-
     function showContent()
     {
         $notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
@@ -101,4 +104,15 @@ class AllAction extends Action
         $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
                           $this->page, 'all', array('nickname' => $this->user->nickname));
     }
+
+    function showPageTitle()
+    {
+        $user =& common_current_user();
+        if ($user && ($user->id == $this->user->id)) {
+            $this->element('h1', NULL, _("You and friends"));
+        } else {
+            $this->element('h1', NULL, sprintf(_('%s and friends'), $this->user->nickname));
+        }
+    }
+
 }
diff --git a/actions/allrss.php b/actions/allrss.php
index 05787f3f7..0114c4396 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -53,7 +53,9 @@ class AllrssAction extends Rss10Action
 
     /**
      * Initialization.
-     * 
+     *
+     * @param array $args Web and URL arguments
+     *
      * @return boolean false if user doesn't exist
      */
     function prepare($args)
@@ -81,7 +83,7 @@ class AllrssAction extends Rss10Action
     {
         $user   = $this->user;
         $notice = $user->noticesWithFriends(0, $limit);
-                                            
+
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
@@ -104,7 +106,8 @@ class AllrssAction extends Rss10Action
                    'link' => common_local_url('all',
                                              array('nickname' =>
                                                    $user->nickname)),
-                   'description' => sprintf(_('Feed for friends of %s'), $user->nickname));
+                   'description' => sprintf(_('Feed for friends of %s'),
+                                            $user->nickname));
         return $c;
     }
 
@@ -123,10 +126,5 @@ class AllrssAction extends Rss10Action
         $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
         return $avatar ? $avatar->url : null;
     }
-
-    function isReadOnly()
-    {
-        return true;
-    }
 }
 
diff --git a/actions/api.php b/actions/api.php
index 21fe4eea3..a27d24492 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -131,14 +131,14 @@ class ApiAction extends Action
                                  'statuses/followers',
                                  'favorites/favorites');
 
-        # If the site is "private", all API methods need authentication
-
+        $fullname = "$this->api_action/$this->api_method";
+        
+        // If the site is "private", all API methods except laconica/config 
+        // need authentication
         if (common_config('site', 'private')) {
-            return true;
+            return $fullname != 'laconica/config' || false;
         }
 
-        $fullname = "$this->api_action/$this->api_method";
-
         if (in_array($fullname, $bareauth)) {
             # bareauth: only needs auth if without an argument
             if ($this->api_arg) {
diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index 9bbdecefa..ca58c9653 100644
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -90,9 +90,9 @@ class AvatarbynicknameAction extends Action
             $url = $avatar->url;
         } else {
             if ($size == 'original') {
-                $url = common_default_avatar(AVATAR_PROFILE_SIZE);
+                $url = Avatar::defaultImage(AVATAR_PROFILE_SIZE);
             } else {
-                $url = common_default_avatar($size+0);
+                $url = Avatar::defaultImage($size+0);
             }
         }
         common_redirect($url, 302);
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 19f53b882..c2bb35a39 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -34,6 +34,8 @@ if (!defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/accountsettingsaction.php';
 
+define('MAX_ORIGINAL', 480);
+
 /**
  * Upload an avatar
  *
@@ -73,7 +75,7 @@ class AvatarsettingsAction extends AccountSettingsAction
 
     function getInstructions()
     {
-        return _('You can upload your personal avatar.');
+        return sprintf(_('You can upload your personal avatar. The maximum file size is %s.'), ImageFile::maxFileSize());
     }
 
     /**
@@ -143,6 +145,7 @@ class AvatarsettingsAction extends AccountSettingsAction
                                         'height' => AVATAR_PROFILE_SIZE,
                                         'alt' => $user->nickname));
             $this->elementEnd('div');
+            $this->submit('delete', _('Delete'));
             $this->elementEnd('li');
         }
 
@@ -153,7 +156,7 @@ class AvatarsettingsAction extends AccountSettingsAction
         $this->element('input', array('name' => 'MAX_FILE_SIZE',
                                       'type' => 'hidden',
                                       'id' => 'MAX_FILE_SIZE',
-                                      'value' => MAX_AVATAR_SIZE));
+                                      'value' => ImageFile::maxFileSizeInt()));
         $this->elementEnd('li');
         $this->elementEnd('ul');
 
@@ -198,7 +201,7 @@ class AvatarsettingsAction extends AccountSettingsAction
                                   'class' => 'avatar_view'));
         $this->element('h2', null, _("Original"));
         $this->elementStart('div', array('id'=>'avatar_original_view'));
-        $this->element('img', array('src' => common_avatar_url($this->filedata['filename']),
+        $this->element('img', array('src' => Avatar::url($this->filedata['filename']),
                                     'width' => $this->filedata['width'],
                                     'height' => $this->filedata['height'],
                                     'alt' => $user->nickname));
@@ -210,7 +213,7 @@ class AvatarsettingsAction extends AccountSettingsAction
                                   'class' => 'avatar_view'));
         $this->element('h2', null, _("Preview"));
         $this->elementStart('div', array('id'=>'avatar_preview_view'));
-        $this->element('img', array('src' => common_avatar_url($this->filedata['filename']),
+        $this->element('img', array('src' => Avatar::url($this->filedata['filename']),
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
                                     'alt' => $user->nickname));
@@ -254,6 +257,8 @@ class AvatarsettingsAction extends AccountSettingsAction
             $this->uploadAvatar();
         } else if ($this->arg('crop')) {
             $this->cropAvatar();
+        } else if ($this->arg('delete')) {
+            $this->deleteAvatar();
         } else {
             $this->showForm(_('Unexpected form submission.'));
         }
@@ -279,14 +284,14 @@ class AvatarsettingsAction extends AccountSettingsAction
 
         $cur = common_current_user();
 
-        $filename = common_avatar_filename($cur->id,
-                                           image_type_to_extension($imagefile->type),
-                                           null,
-                                           'tmp'.common_timestamp());
+        $filename = Avatar::filename($cur->id,
+                                     image_type_to_extension($imagefile->type),
+                                     null,
+                                     'tmp'.common_timestamp());
 
-        $filepath = common_avatar_path($filename);
+        $filepath = Avatar::path($filename);
 
-        move_uploaded_file($imagefile->filename, $filepath);
+        move_uploaded_file($imagefile->filepath, $filepath);
 
         $filedata = array('filename' => $filename,
                           'filepath' => $filepath,
@@ -312,15 +317,6 @@ class AvatarsettingsAction extends AccountSettingsAction
 
     function cropAvatar()
     {
-        $user = common_current_user();
-
-        $profile = $user->getProfile();
-
-        $x = $this->arg('avatar_crop_x');
-        $y = $this->arg('avatar_crop_y');
-        $w = $this->arg('avatar_crop_w');
-        $h = $this->arg('avatar_crop_h');
-
         $filedata = $_SESSION['FILEDATA'];
 
         if (!$filedata) {
@@ -328,75 +324,54 @@ class AvatarsettingsAction extends AccountSettingsAction
             return;
         }
 
-        $filepath = common_avatar_path($filedata['filename']);
-
-        if (!file_exists($filepath)) {
-            $this->serverError(_('Lost our file.'));
-            return;
-        }
+        $file_d = ($filedata['width'] > $filedata['height'])
+                     ? $filedata['height'] : $filedata['width'];
 
-        switch ($filedata['type']) {
-        case IMAGETYPE_GIF:
-            $image_src = imagecreatefromgif($filepath);
-            break;
-        case IMAGETYPE_JPEG:
-            $image_src = imagecreatefromjpeg($filepath);
-            break;
-        case IMAGETYPE_PNG:
-            $image_src = imagecreatefrompng($filepath);
-            break;
-         default:
-            $this->serverError(_('Unknown file type'));
-            return;
-        }
-
-        common_debug("W = $w, H = $h, X = $x, Y = $y");
-
-        $image_dest = imagecreatetruecolor($w, $h);
-
-        $background = imagecolorallocate($image_dest, 0, 0, 0);
-        ImageColorTransparent($image_dest, $background);
-        imagealphablending($image_dest, false);
-
-        imagecopyresized($image_dest, $image_src, 0, 0, $x, $y, $w, $h, $w, $h);
-
-        $cur = common_current_user();
-
-        $filename = common_avatar_filename($cur->id,
-                                           image_type_to_extension($filedata['type']),
-                                           null,
-                                           common_timestamp());
-
-        $filepath = common_avatar_path($filename);
-
-        switch ($filedata['type']) {
-        case IMAGETYPE_GIF:
-            imagegif($image_dest, $filepath);
-            break;
-        case IMAGETYPE_JPEG:
-            imagejpeg($image_dest, $filepath);
-            break;
-        case IMAGETYPE_PNG:
-            imagepng($image_dest, $filepath);
-            break;
-         default:
-            $this->serverError(_('Unknown file type'));
-            return;
-        }
+        $dest_x = $this->arg('avatar_crop_x') ? $this->arg('avatar_crop_x'):0;
+        $dest_y = $this->arg('avatar_crop_y') ? $this->arg('avatar_crop_y'):0;
+        $dest_w = $this->arg('avatar_crop_w') ? $this->arg('avatar_crop_w'):$file_d;
+        $dest_h = $this->arg('avatar_crop_h') ? $this->arg('avatar_crop_h'):$file_d;
+        $size = min($dest_w, $dest_h, MAX_ORIGINAL);
 
         $user = common_current_user();
+        $profile = $user->getProfile();
 
-        $profile = $cur->getProfile();
+        $imagefile = new ImageFile($user->id, $filedata['filepath']);
+        $filename = $imagefile->resize($size, $dest_x, $dest_y, $dest_w, $dest_h);
 
-        if ($profile->setOriginal($filepath)) {
-            @unlink(common_avatar_path($filedata['filename']));
+        if ($profile->setOriginal($filename)) {
+            @unlink($filedata['filepath']);
             unset($_SESSION['FILEDATA']);
             $this->mode = 'upload';
             $this->showForm(_('Avatar updated.'), true);
+            common_broadcast_profile($profile);
         } else {
             $this->showForm(_('Failed updating avatar.'));
         }
     }
+    
+    /**
+     * Get rid of the current avatar.
+     *
+     * @return void
+     */
+    
+    function deleteAvatar()
+    {
+        $user = common_current_user();
+        $profile = $user->getProfile();
+        
+        $avatar = $profile->getOriginalAvatar();
+        $avatar->delete();
+        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+        $avatar->delete();
+        $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
+        $avatar->delete();
+        $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
+        $avatar->delete();
+
+        $this->showForm(_('Avatar deleted.'), true);
+    }
 
     /**
      * Add the jCrop stylesheet
@@ -426,12 +401,14 @@ class AvatarsettingsAction extends AccountSettingsAction
     {
         parent::showScripts();
 
-        $jcropPack = common_path('js/jcrop/jquery.Jcrop.pack.js');
-        $jcropGo   = common_path('js/jcrop/jquery.Jcrop.go.js');
+        if ($this->mode == 'crop') {
+            $jcropPack = common_path('js/jcrop/jquery.Jcrop.pack.js');
+            $jcropGo   = common_path('js/jcrop/jquery.Jcrop.go.js');
 
-        $this->element('script', array('type' => 'text/javascript',
-                                       'src' => $jcropPack));
-        $this->element('script', array('type' => 'text/javascript',
-                                       'src' => $jcropGo));
+            $this->element('script', array('type' => 'text/javascript',
+                                           'src' => $jcropPack));
+            $this->element('script', array('type' => 'text/javascript',
+                                           'src' => $jcropGo));
+        }
     }
 }
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index efef95441..16e2df889 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -71,7 +71,7 @@ class DeletenoticeAction extends DeleteAction
     function getInstructions()
     {
         return _('You are about to permanently delete a notice. ' .
-            'Once this is done, it cannot be undone.');
+                 'Once this is done, it cannot be undone.');
     }
 
     function title()
@@ -103,24 +103,18 @@ class DeletenoticeAction extends DeleteAction
 
     function showContent()
     {
-        $this->elementStart('form', array('id' => 'notice_delete_form',
-                                   'method' => 'post',
-                                   'action' => common_local_url('deletenotice')));
+        $this->elementStart('form', array('id' => 'form_notice_delete',
+                                          'class' => 'form_settings',
+                                          'method' => 'post',
+                                          'action' => common_local_url('deletenotice')));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Delete notice'));
         $this->hidden('token', common_session_token());
         $this->hidden('notice', $this->trimmed('notice'));
-        $this->elementStart('p');
-        $this->element('span', array('id' => 'confirmation_text'),
-            _('Are you sure you want to delete this notice?'));
-
-        $this->element('input', array('id' => 'submit_no',
-                          'name' => 'submit',
-                          'type' => 'submit',
-                          'value' => _('No')));
-        $this->element('input', array('id' => 'submit_yes',
-                          'name' => 'submit',
-                          'type' => 'submit',
-                          'value' => _('Yes')));
-        $this->elementEnd('p');
+        $this->element('p', null, _('Are you sure you want to delete this notice?'));
+        $this->submit('form_action-yes', _('Yes'), 'submit form_action-primary', 'yes');
+        $this->submit('form_action-no', _('No'), 'submit form_action-secondary', 'no');
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
@@ -131,35 +125,22 @@ class DeletenoticeAction extends DeleteAction
 
         if (!$token || $token != common_session_token()) {
             $this->showForm(_('There was a problem with your session token. ' .
-                ' Try again, please.'));
+                              ' Try again, please.'));
             return;
         }
 
-        $url       = common_get_returnto();
-        $confirmed = $this->trimmed('submit');
-
-        if ($confirmed == _('Yes')) {
-
-            $replies = new Reply;
-            $replies->get('notice_id', $this->notice->id);
-
-            common_dequeue_notice($this->notice);
-
-            if (common_config('memcached', 'enabled')) {
-                $notice->blowSubsCache();
-            }
-
-            $replies->delete();
+        if ($this->arg('yes')) {
             $this->notice->delete();
+        }
 
-        } else {
+        $url = common_get_returnto();
 
-            if ($url) {
-                common_set_returnto(null);
-            } else {
-                $url = common_local_url('public');
-            }
+        if ($url) {
+            common_set_returnto(null);
+        } else {
+            $url = common_local_url('public');
         }
+
         common_redirect($url);
     }
 }
diff --git a/actions/disfavor.php b/actions/disfavor.php
index 09b3bf18d..90bab3cca 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -89,7 +89,7 @@ class DisfavorAction extends Action
         }
         $user->blowFavesCache();
         if ($this->boolean('ajax')) {
-            $this->startHTML('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             $this->element('title', null, _('Add to favorites'));
             $this->elementEnd('head');
diff --git a/actions/doc.php b/actions/doc.php
index 6957659ad..ebffb7c15 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -50,7 +50,7 @@ class DocAction extends Action
 
     /**
      * Class handler.
-     * 
+     *
      * @param array $args array of arguments
      *
      * @return nothing
@@ -59,7 +59,7 @@ class DocAction extends Action
     {
         parent::handle($args);
         $this->title    = $this->trimmed('title');
-        $this->filename = INSTALLDIR.'/doc/'.$this->title;
+        $this->filename = INSTALLDIR.'/doc-src/'.$this->title;
         if (!file_exists($this->filename)) {
             $this->clientError(_('No such document.'));
             return;
@@ -71,14 +71,14 @@ class DocAction extends Action
     function showPageTitle() {
         $this->element('h1', array('class' => 'entry-title'), $this->title());
     }
-    
+
     // overrided to add hentry, and content-inner classes
     function showContentBlock()
      {
          $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
          $this->showPageTitle();
          $this->showPageNoticeBlock();
-         $this->elementStart('div', array('id' => 'content_inner', 
+         $this->elementStart('div', array('id' => 'content_inner',
              'class' => 'entry-content'));
          // show the actual content (forms, lists, whatever)
          $this->showContent();
@@ -88,7 +88,7 @@ class DocAction extends Action
 
     /**
      * Display content.
-     * 
+     *
      * @return nothing
      */
     function showContent()
@@ -100,7 +100,7 @@ class DocAction extends Action
 
     /**
      * Page title.
-     * 
+     *
      * @return page title
      */
     function title()
diff --git a/actions/editgroup.php b/actions/editgroup.php
index 98ebcb87a..e7e79040a 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -191,13 +191,13 @@ class EditgroupAction extends Action
                                         array('http', 'https')))) {
             $this->showForm(_('Homepage is not a valid URL.'));
             return;
-        } else if (!is_null($fullname) && strlen($fullname) > 255) {
+        } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
             $this->showForm(_('Full name is too long (max 255 chars).'));
             return;
-        } else if (!is_null($description) && strlen($description) > 140) {
+        } else if (!is_null($description) && mb_strlen($description) > 140) {
             $this->showForm(_('description is too long (max 140 chars).'));
             return;
-        } else if (!is_null($location) && strlen($location) > 255) {
+        } else if (!is_null($location) && mb_strlen($location) > 255) {
             $this->showForm(_('Location is too long (max 255 chars).'));
             return;
         }
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index b84acb214..634388fdd 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -164,6 +164,11 @@ class EmailsettingsAction extends AccountSettingsAction
                         $user->emailnotifymsg);
         $this->elementEnd('li');
         $this->elementStart('li');
+        $this->checkbox('emailnotifyattn',
+                        _('Send me email when someone sends me an "@-reply".'),
+                        $user->emailnotifyattn);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('emailnotifynudge',
                         _('Allow friends to nudge me and send me an email.'),
                         $user->emailnotifynudge);
@@ -255,6 +260,7 @@ class EmailsettingsAction extends AccountSettingsAction
         $emailnotifyfav   = $this->boolean('emailnotifyfav');
         $emailnotifymsg   = $this->boolean('emailnotifymsg');
         $emailnotifynudge = $this->boolean('emailnotifynudge');
+        $emailnotifyattn  = $this->boolean('emailnotifyattn');
         $emailmicroid     = $this->boolean('emailmicroid');
         $emailpost        = $this->boolean('emailpost');
 
@@ -270,6 +276,7 @@ class EmailsettingsAction extends AccountSettingsAction
         $user->emailnotifyfav   = $emailnotifyfav;
         $user->emailnotifymsg   = $emailnotifymsg;
         $user->emailnotifynudge = $emailnotifynudge;
+        $user->emailnotifyattn  = $emailnotifyattn;
         $user->emailmicroid     = $emailmicroid;
         $user->emailpost        = $emailpost;
 
diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index 3558cf671..5946e6c98 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -43,11 +43,11 @@ class FacebookhomeAction extends FacebookAction
     function handle($args)
     {
         parent::handle($args);        
-        
+                
         // If the user has opted not to initially allow the app to have
         // Facebook status update permission, store that preference. Only
         // promt the user the first time she uses the app
-        if ($this->arg('skip')) {
+        if ($this->arg('skip') || $args['fb_sig_request_method'] == 'GET') {
             $this->facebook->api_client->data_setUserPreference(
                 FACEBOOK_PROMPTED_UPDATE_PREF, 'true');
         }
@@ -89,7 +89,7 @@ class FacebookhomeAction extends FacebookAction
         }
 
     }
-
+    
     function login()
     {
         
@@ -122,7 +122,6 @@ class FacebookhomeAction extends FacebookAction
                 // XXX: Do some error handling here
 
                 $this->setDefaults();
-                //$this->showHome($flink, _('You can now use Identi.ca from Facebook!'));
 
                 $this->getUpdatePermission();
                 return;
@@ -133,6 +132,7 @@ class FacebookhomeAction extends FacebookAction
         }
 
         $this->showLoginForm($msg);
+        $this->showFooter();
 
     }
 
@@ -148,7 +148,6 @@ class FacebookhomeAction extends FacebookAction
 
     function showNoticeForm()
     {
-        
         $post_action = "$this->app_uri/index.php";
         
         $notice_form = new FacebookNoticeForm($this, $post_action, null, 
@@ -167,7 +166,6 @@ class FacebookhomeAction extends FacebookAction
 
     function showContent()
     {
-
         $notice = $this->user->noticesWithFriends(($this->page-1) *
             NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
         
@@ -177,7 +175,6 @@ class FacebookhomeAction extends FacebookAction
 
         $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
                           $this->page, 'index.php', array('nickname' => $this->user->nickname));
-
     }
 
     function showNoticeList($notice)
@@ -191,7 +188,7 @@ class FacebookhomeAction extends FacebookAction
 
         $this->showStylesheets();
 
-        $this->elementStart('div', array('class' => 'content'));
+        $this->elementStart('div', array('class' => 'facebook_guide'));
 
         $instructions = sprintf(_('If you would like the %s app to automatically update ' .
             'your Facebook status with your latest notice, you need ' .
@@ -207,11 +204,19 @@ class FacebookhomeAction extends FacebookAction
 
         $this->elementStart('ul', array('id' => 'fb-permissions-list'));
         $this->elementStart('li', array('id' => 'fb-permissions-item'));
-        $this->elementStart('fb:prompt-permission', array('perms' => 'status_update',
-            'next_fbjs' => 'document.setLocation(\'' . "$this->app_uri/index.php" . '\')'));
-        $this->element('span', array('class' => 'facebook-button'),
-            sprintf(_('Allow %s to update my Facebook status'), $this->app_name));
-        $this->elementEnd('fb:prompt-permission');
+        
+        $next = urlencode("$this->app_uri/index.php");
+        $api_key = common_config('facebook', 'apikey');
+        
+        $auth_url = 'http://www.facebook.com/authorize.php?api_key=' .
+            $api_key . '&v=1.0&ext_perm=status_update&next=' . $next . 
+            '&next_cancel=' . $next . '&submit=skip';
+        
+        $this->elementStart('span', array('class' => 'facebook-button'));
+        $this->element('a', array('href' => $auth_url), 
+            sprintf(_('Okay, do it!'), $this->app_name));
+        $this->elementEnd('span');
+
         $this->elementEnd('li');
 
         $this->elementStart('li', array('id' => 'fb-permissions-item'));
@@ -223,53 +228,6 @@ class FacebookhomeAction extends FacebookAction
         $this->elementEnd('div');
 
     }
-
-    function saveNewNotice()
-    {
-
-        $user = $this->flink->getUser();
-
-        $content = $this->trimmed('status_textarea');
-        
-        if (!$content) {
-            $this->showPage(_('No notice content!'));
-            return;
-        } else {
-            $content_shortened = common_shorten_links($content);
-
-            if (mb_strlen($content_shortened) > 140) {
-                common_debug("Content = '$content_shortened'", __FILE__);
-                common_debug("mb_strlen(\$content) = " . mb_strlen($content_shortened), __FILE__);
-                $this->showPage(_('That\'s too long. Max notice size is 140 chars.'));
-                return;
-            }
-        }
-
-        $inter = new CommandInterpreter();
-
-        $cmd = $inter->handle_command($user, $content_shortened);
-
-        if ($cmd) {
-            
-            // XXX fix this
-            
-            $cmd->execute(new WebChannel());
-            return;
-        }
-
-        $replyto = $this->trimmed('inreplyto');
-
-        $notice = Notice::saveNew($user->id, $content,
-            'Facebook', 1, ($replyto == 'false') ? null : $replyto);
-
-        if (is_string($notice)) {
-            $this->showPage($notice);
-            return;
-        }
-
-        common_broadcast_notice($notice);
-        
-    }
     
     /**
      * Generate pagination links
diff --git a/actions/facebookinvite.php b/actions/facebookinvite.php
index b7224783a..1302064ad 100644
--- a/actions/facebookinvite.php
+++ b/actions/facebookinvite.php
@@ -71,13 +71,13 @@ class FacebookinviteAction extends FacebookAction
             common_config('site', 'name')));
         $this->element('p', null, _('Invitations have been sent to the following users:'));
 
-        $friend_ids = $_POST['ids']; // XXX: Hmm... is this the best way to acces the list?
+        $friend_ids = $_POST['ids']; // XXX: Hmm... is this the best way to access the list?
 
-        $this->elementStart("ul");
+        $this->elementStart('ul', array('id' => 'facebook-friends'));
 
         foreach ($friend_ids as $friend) {
             $this->elementStart('li');
-            $this->element('fb:profile-pic', array('uid' => $friend));
+            $this->element('fb:profile-pic', array('uid' => $friend, 'size' => 'square'));
             $this->element('fb:name', array('uid' => $friend,
                                             'capitalize' => 'true'));
             $this->elementEnd('li');
@@ -92,6 +92,12 @@ class FacebookinviteAction extends FacebookAction
 
         // Get a list of users who are already using the app for exclusion
         $exclude_ids = $this->facebook->api_client->friends_getAppUsers();
+        $exclude_ids_csv = null;
+        
+        // fbml needs these as a csv string, not an array
+        if ($exclude_ids) {
+            $exclude_ids_csv = implode(',', $exclude_ids);
+        }
 
         $content = sprintf(_('You have been invited to %s'), common_config('site', 'name')) .
             htmlentities('<fb:req-choice url="' . $this->app_uri . '" label="Add"/>');
@@ -103,20 +109,27 @@ class FacebookinviteAction extends FacebookAction
                                                       'content' => $content));
         $this->hidden('invite', 'true');
         $actiontext = sprintf(_('Invite your friends to use %s'), common_config('site', 'name'));
-        $this->element('fb:multi-friend-selector', array('showborder' => 'false',
-                                                               'actiontext' => $actiontext,
-                                                               'exclude_ids' => implode(',', $exclude_ids),
-                                                               'bypass' => 'cancel'));
+        
+        $multi_params = array('showborder' => 'false');    
+        $multi_params['actiontext'] = $actiontext;
+        
+        if ($exclude_ids_csv) {
+            $multi_params['exclude_ids'] = $exclude_ids_csv;
+        }
+
+        $multi_params['bypass'] = 'cancel';
+                
+        $this->element('fb:multi-friend-selector', $multi_params);
 
         $this->elementEnd('fb:request-form');
 
         $this->element('h2', null, sprintf(_('Friends already using %s:'), 
             common_config('site', 'name')));
-        $this->elementStart("ul");
-
+        $this->elementStart('ul', array('id' => 'facebook-friends'));
+        
         foreach ($exclude_ids as $friend) {
             $this->elementStart('li');
-            $this->element('fb:profile-pic', array('uid' => $friend));
+            $this->element('fb:profile-pic', array('uid' => $friend, 'size' => 'square'));
             $this->element('fb:name', array('uid' => $friend,
                                             'capitalize' => 'true'));
             $this->elementEnd('li');
diff --git a/actions/favor.php b/actions/favor.php
index 8ecde4b11..3940df688 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -89,7 +89,7 @@ class FavorAction extends Action
         $this->notify($notice, $user);
         $user->blowFavesCache();
         if ($this->boolean('ajax')) {
-            $this->startHTML('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             $this->element('title', null, _('Disfavor favorite'));
             $this->elementEnd('head');
diff --git a/actions/favorited.php b/actions/favorited.php
index 4155b3a23..5082f4a4e 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -104,6 +104,9 @@ class FavoritedAction extends Action
     {
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
@@ -166,8 +169,14 @@ class FavoritedAction extends Action
 
     function showContent()
     {
+        if (common_config('db', 'type') == 'pgsql') {
+            $weightexpr='sum(exp(-extract(epoch from (now() - fave.modified)) / %s))';
+        } else {
+            $weightexpr='sum(exp(-(now() - fave.modified) / %s))';
+        }
+
         $qry = 'SELECT notice.*, '.
-          'sum(exp(-(now() - fave.modified) / %s)) as weight ' .
+          $weightexpr . ' as weight ' .
           'FROM notice JOIN fave ON notice.id = fave.notice_id ' .
           'GROUP BY fave.notice_id ' .
           'ORDER BY weight DESC';
diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php
index ad72dce9e..f85bf1b19 100644
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -44,22 +44,32 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  * @package  Laconica
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://laconi.ca/
  */
 class FavoritesrssAction extends Rss10Action
 {
-    var $user = null;
     
+    /** The user whose favorites to display */
+    
+    var $user = null;
+        
     /**
-     * Initialization.
-     * 
-     * @return boolean false if user doesn't exist
+     * Find the user to display by supplied nickname
+     *
+     * @param array $args Arguments from $_REQUEST
+     *
+     * @return boolean success
      */
-    function init()
+
+    function prepare($args)
     {
+        parent::prepare($args);
+        
         $nickname   = $this->trimmed('nickname');
         $this->user = User::staticGet('nickname', $nickname);
+
         if (!$this->user) {
             $this->clientError(_('No such user.'));
             return false;
@@ -67,7 +77,7 @@ class FavoritesrssAction extends Rss10Action
             return true;
         }
     }
-
+    
     /**
      * Get notices
      *
@@ -94,30 +104,26 @@ class FavoritesrssAction extends Rss10Action
     function getChannel()
     {
         $user = $this->user;
-        $c     = array('url' => common_local_url('favoritesrss',
-                                             array('nickname' =>
-                                                   $user->nickname)),
+        $c    = array('url' => common_local_url('favoritesrss',
+                                        array('nickname' =>
+                                        $user->nickname)),
                    'title' => sprintf(_("%s favorite notices"), $user->nickname),
                    'link' => common_local_url('showfavorites',
-                                             array('nickname' =>
-                                                   $user->nickname)),
-                   'description' => sprintf(_('Feed of favorite notices of %s'), $user->nickname));
+                                        array('nickname' =>
+                                        $user->nickname)),
+                   'description' => sprintf(_('Feed of favorite notices of %s'), 
+                                        $user->nickname));
         return $c;
     }
 
     /**
      * Get image.
      *
-     * @return voir
+     * @return void
     */
     function getImage()
     {
         return null;
     }
 
-    function isReadOnly()
-    {
-        return true;
-    }
 }
-
diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index 880a9505b..6d92cb9aa 100644
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -30,7 +30,7 @@ class FinishopenidloginAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        if (common_logged_in()) {
+        if (common_is_real_login()) {
             $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $token = $this->trimmed('token');
@@ -83,7 +83,7 @@ class FinishopenidloginAction extends Action
 
     function showContent()
     {
-        if ($this->message_text) {
+        if (!empty($this->message_text)) {
             $this->element('p', null, $this->message);
             return;
         }
@@ -232,7 +232,8 @@ class FinishopenidloginAction extends Action
             return;
         }
 
-        if ($sreg['country']) {
+        $location = '';
+        if (!empty($sreg['country'])) {
             if ($sreg['postcode']) {
                 # XXX: use postcode to get city and region
                 # XXX: also, store postcode somewhere -- it's valuable!
@@ -242,12 +243,16 @@ class FinishopenidloginAction extends Action
             }
         }
 
-        if ($sreg['fullname'] && strlen($sreg['fullname']) <= 255) {
+        if (!empty($sreg['fullname']) && mb_strlen($sreg['fullname']) <= 255) {
             $fullname = $sreg['fullname'];
+        } else {
+            $fullname = '';
         }
 
-        if ($sreg['email'] && Validate::email($sreg['email'], true)) {
+        if (!empty($sreg['email']) && Validate::email($sreg['email'], true)) {
             $email = $sreg['email'];
+        } else {
+            $email = '';
         }
 
         # XXX: add language
@@ -328,7 +333,7 @@ class FinishopenidloginAction extends Action
 
         # Try the passed-in nickname
 
-        if ($sreg['nickname']) {
+        if (!empty($sreg['nickname'])) {
             $nickname = $this->nicknamize($sreg['nickname']);
             if ($this->isNewNickname($nickname)) {
                 return $nickname;
@@ -337,7 +342,7 @@ class FinishopenidloginAction extends Action
 
         # Try the full name
 
-        if ($sreg['fullname']) {
+        if (!empty($sreg['fullname'])) {
             $fullname = $this->nicknamize($sreg['fullname']);
             if ($this->isNewNickname($fullname)) {
                 return $fullname;
diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index f9094a50c..acfacbdc1 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -237,7 +237,13 @@ class FinishremotesubscribeAction extends Action
     {
         $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
         copy($url, $temp_filename);
-        return $profile->setOriginal($temp_filename);
+        $imagefile = new ImageFile($profile->id, $temp_filename);
+        $filename = Avatar::filename($profile->id,
+                                     image_type_to_extension($imagefile->type),
+                                     null,
+                                     common_timestamp());
+        rename($temp_filename, Avatar::path($filename));
+        return $profile->setOriginal($filename);
     }
 
     function access_token($omb)
@@ -277,7 +283,7 @@ class FinishremotesubscribeAction extends Action
         $fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
         $result = $fetcher->post($req->get_normalized_http_url(),
                                  $req->to_postdata(),
-                                 array('User-Agent' => 'Laconica/' . LACONICA_VERSION));
+                                 array('User-Agent: Laconica/' . LACONICA_VERSION));
 
         common_debug('got result: "'.print_r($result,true).'"', __FILE__);
 
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index fe42ab36c..499db4ae8 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -34,6 +34,8 @@ if (!defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/accountsettingsaction.php';
 
+define('MAX_ORIGINAL', 480);
+
 /**
  * Upload an avatar
  *
@@ -53,6 +55,8 @@ class GrouplogoAction extends Action
     var $mode = null;
     var $imagefile = null;
     var $filename = null;
+    var $msg = null;
+    var $success = null;
 
     /**
      * Prepare to run
@@ -121,9 +125,11 @@ class GrouplogoAction extends Action
         }
     }
 
-    function showForm($msg = null)
+    function showForm($msg = null, $success = false)
     {
-        $this->msg = $msg;
+        $this->msg     = $msg;
+        $this->success = $success;
+
         $this->showPage();
     }
 
@@ -146,7 +152,7 @@ class GrouplogoAction extends Action
 
     function getInstructions()
     {
-        return _('You can upload a logo image for your group.');
+        return sprintf(_('You can upload a logo image for your group. The maximum file size is %s.'), ImageFile::maxFileSize());
     }
 
     /**
@@ -223,7 +229,7 @@ class GrouplogoAction extends Action
         $this->element('input', array('name' => 'MAX_FILE_SIZE',
                                       'type' => 'hidden',
                                       'id' => 'MAX_FILE_SIZE',
-                                      'value' => MAX_AVATAR_SIZE));
+                                      'value' => ImageFile::maxFileSizeInt()));
         $this->elementEnd('li');
         $this->elementEnd('ul');
 
@@ -257,7 +263,7 @@ class GrouplogoAction extends Action
                                   'class' => 'avatar_view'));
         $this->element('h2', null, _("Original"));
         $this->elementStart('div', array('id'=>'avatar_original_view'));
-        $this->element('img', array('src' => common_avatar_url($this->filedata['filename']),
+        $this->element('img', array('src' => Avatar::url($this->filedata['filename']),
                                     'width' => $this->filedata['width'],
                                     'height' => $this->filedata['height'],
                                     'alt' => $this->group->nickname));
@@ -269,7 +275,7 @@ class GrouplogoAction extends Action
                                   'class' => 'avatar_view'));
         $this->element('h2', null, _("Preview"));
         $this->elementStart('div', array('id'=>'avatar_preview_view'));
-        $this->element('img', array('src' => common_avatar_url($this->filedata['filename']),
+        $this->element('img', array('src' => Avatar::url($this->filedata['filename']),
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
                                     'alt' => $this->group->nickname));
@@ -281,6 +287,7 @@ class GrouplogoAction extends Action
                                           'type' => 'hidden',
                                           'id' => $crop_info));
         }
+
         $this->submit('crop', _('Crop'));
 
         $this->elementEnd('li');
@@ -310,9 +317,9 @@ class GrouplogoAction extends Action
         }
 
         if ($this->arg('upload')) {
-            $this->uploadAvatar();
+            $this->uploadLogo();
         } else if ($this->arg('crop')) {
-            $this->cropAvatar();
+            $this->cropLogo();
         } else {
             $this->showForm(_('Unexpected form submission.'));
         }
@@ -327,7 +334,7 @@ class GrouplogoAction extends Action
      * @return void
      */
 
-    function uploadAvatar()
+    function uploadLogo()
     {
         try {
             $imagefile = ImageFile::fromUpload('avatarfile');
@@ -336,14 +343,14 @@ class GrouplogoAction extends Action
             return;
         }
 
-        $filename = common_avatar_filename($this->group->id,
-                                           image_type_to_extension($imagefile->type),
-                                           null,
-                                           'group-temp-'.common_timestamp());
+        $filename = Avatar::filename($this->group->id,
+                                     image_type_to_extension($imagefile->type),
+                                     null,
+                                     'group-temp-'.common_timestamp());
 
-        $filepath = common_avatar_path($filename);
+        $filepath = Avatar::path($filename);
 
-        move_uploaded_file($imagefile->filename, $filepath);
+        move_uploaded_file($imagefile->filepath, $filepath);
 
         $filedata = array('filename' => $filename,
                           'filepath' => $filepath,
@@ -357,7 +364,7 @@ class GrouplogoAction extends Action
 
         $this->mode = 'crop';
 
-        $this->showForm(_('Pick a square area of the image to be your avatar'),
+        $this->showForm(_('Pick a square area of the image to be the logo.'),
                         true);
     }
 
@@ -367,17 +374,8 @@ class GrouplogoAction extends Action
      * @return void
      */
 
-    function cropAvatar()
+    function cropLogo()
     {
-        $user = common_current_user();
-
-        $profile = $user->getProfile();
-
-        $x = $this->arg('avatar_crop_x');
-        $y = $this->arg('avatar_crop_y');
-        $w = $this->arg('avatar_crop_w');
-        $h = $this->arg('avatar_crop_h');
-
         $filedata = $_SESSION['FILEDATA'];
 
         if (!$filedata) {
@@ -385,64 +383,19 @@ class GrouplogoAction extends Action
             return;
         }
 
-        $filepath = common_avatar_path($filedata['filename']);
-
-        if (!file_exists($filepath)) {
-            $this->serverError(_('Lost our file.'));
-            return;
-        }
-
-        switch ($filedata['type']) {
-        case IMAGETYPE_GIF:
-            $image_src = imagecreatefromgif($filepath);
-            break;
-        case IMAGETYPE_JPEG:
-            $image_src = imagecreatefromjpeg($filepath);
-            break;
-        case IMAGETYPE_PNG:
-            $image_src = imagecreatefrompng($filepath);
-            break;
-         default:
-            $this->serverError(_('Unknown file type'));
-            return;
-        }
-
-        common_debug("W = $w, H = $h, X = $x, Y = $y");
-
-        $image_dest = imagecreatetruecolor($w, $h);
-
-        $background = imagecolorallocate($image_dest, 0, 0, 0);
-        ImageColorTransparent($image_dest, $background);
-        imagealphablending($image_dest, false);
-
-        imagecopyresized($image_dest, $image_src, 0, 0, $x, $y, $w, $h, $w, $h);
+        // If image is not being cropped assume pos & dimentions of original
+        $dest_x = $this->arg('avatar_crop_x') ? $this->arg('avatar_crop_x'):0;
+        $dest_y = $this->arg('avatar_crop_y') ? $this->arg('avatar_crop_y'):0;
+        $dest_w = $this->arg('avatar_crop_w') ? $this->arg('avatar_crop_w'):$filedata['width'];
+        $dest_h = $this->arg('avatar_crop_h') ? $this->arg('avatar_crop_h'):$filedata['height'];
+        $size = min($dest_w, $dest_h);
+        $size = ($size > MAX_ORIGINAL) ? MAX_ORIGINAL:$size;
 
-        $cur = common_current_user();
-
-        $filename = common_avatar_filename($this->group->id,
-                                           image_type_to_extension($imagefile->type),
-                                           null,
-                                           'group-'.common_timestamp());
-
-        $filepath = common_avatar_path($filename);
-
-        switch ($filedata['type']) {
-        case IMAGETYPE_GIF:
-            imagegif($image_dest, $filepath);
-            break;
-        case IMAGETYPE_JPEG:
-            imagejpeg($image_dest, $filepath);
-            break;
-        case IMAGETYPE_PNG:
-            imagepng($image_dest, $filepath);
-            break;
-         default:
-            $this->serverError(_('Unknown file type'));
-            return;
-        }
+        $imagefile = new ImageFile($this->group->id, $filedata['filepath']);
+        $filename = $imagefile->resize($size, $dest_x, $dest_y, $dest_w, $dest_h);
 
-        if ($this->group->setOriginal($filename, $filedata['type'])) {
-            @unlink(common_avatar_path($filedata['filename']));
+        if ($this->group->setOriginal($filename)) {
+            @unlink($filedata['filepath']);
             unset($_SESSION['FILEDATA']);
             $this->mode = 'upload';
             $this->showForm(_('Logo updated.'), true);
@@ -494,13 +447,15 @@ class GrouplogoAction extends Action
     {
         parent::showScripts();
 
-        $jcropPack = common_path('js/jcrop/jquery.Jcrop.pack.js');
-        $jcropGo   = common_path('js/jcrop/jquery.Jcrop.go.js');
+        if ($this->mode == 'crop') {
+            $jcropPack = common_path('js/jcrop/jquery.Jcrop.pack.js');
+            $jcropGo   = common_path('js/jcrop/jquery.Jcrop.go.js');
 
-        $this->element('script', array('type' => 'text/javascript',
-                                       'src' => $jcropPack));
-        $this->element('script', array('type' => 'text/javascript',
-                                       'src' => $jcropGo));
+            $this->element('script', array('type' => 'text/javascript',
+                                           'src' => $jcropPack));
+            $this->element('script', array('type' => 'text/javascript',
+                                           'src' => $jcropGo));
+        }
     }
 
     function showLocalNav()
diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 53395c418..00f43a9f5 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -122,11 +122,13 @@ class GroupmembersAction extends Action
         $offset = ($this->page-1) * PROFILES_PER_PAGE;
         $limit =  PROFILES_PER_PAGE + 1;
 
+        $cnt = 0;
+
         $members = $this->group->getMembers($offset, $limit);
 
         if ($members) {
             $member_list = new ProfileList($members, null, $this);
-            $member_list->show();
+            $cnt = $member_list->show();
         }
 
         $members->free();
diff --git a/actions/grouprss.php b/actions/grouprss.php
new file mode 100644
index 000000000..de76a5960
--- /dev/null
+++ b/actions/grouprss.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Group main page
+ *
+ * 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  Group
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/rssaction.php';
+
+define('MEMBERS_PER_SECTION', 81);
+
+/**
+ * Group RSS feed
+ *
+ * @category Group
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class groupRssAction extends Rss10Action
+{
+    /** group we're viewing. */
+    var $group = null;
+
+    /**
+     * Is this page read-only?
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly()
+    {
+        return true;
+    }
+
+    /**
+     * Prepare the action
+     *
+     * Reads and validates arguments and instantiates the attributes.
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if (!common_config('inboxes','enabled')) {
+            $this->serverError(_('Inboxes must be enabled for groups to work'));
+            return false;
+        }
+
+        $nickname_arg = $this->arg('nickname');
+        $nickname = common_canonical_nickname($nickname_arg);
+
+        // Permanent redirect on non-canonical nickname
+
+        if ($nickname_arg != $nickname) {
+            $args = array('nickname' => $nickname);
+            common_redirect(common_local_url('showgroup', $args), 301);
+            return false;
+        }
+
+        if (!$nickname) {
+            $this->clientError(_('No nickname'), 404);
+            return false;
+        }
+
+        $this->group = User_group::staticGet('nickname', $nickname);
+
+        if (!$this->group) {
+            $this->clientError(_('No such group'), 404);
+            return false;
+        }
+
+        return true;
+    }
+
+    function getNotices($limit=0)
+    {
+
+        $group = $this->group;
+
+        if (is_null($group)) {
+            return null;
+        }
+
+        $notice = $group->getNotices(0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
+
+        while ($notice->fetch()) {
+            $notices[] = clone($notice);
+        }
+
+        return $notices;
+    }
+
+    function getChannel()
+    {
+        $group = $this->group;
+        $c = array('url' => common_local_url('grouprss',
+                                             array('nickname' =>
+                                                   $group->nickname)),
+                   'title' => $group->nickname,
+                   'link' => common_local_url('showgroup', array('nickname' => $group->nickname)),
+                   'description' => sprintf(_('Microblog by %s group'), $group->nickname));
+        return $c;
+    }
+
+    function getImage()
+    {
+        return $this->group->homepage_logo;
+    }
+}
diff --git a/actions/login.php b/actions/login.php
index 11cf1f02a..b049791fb 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -78,6 +78,7 @@ class LoginAction extends Action
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->checkLogin();
         } else {
+            common_ensure_session();
             $this->showForm();
         }
     }
@@ -96,7 +97,7 @@ class LoginAction extends Action
     {
         // XXX: login throttle
 
-        // CSRF protection - token set in common_notice_form()
+        // 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. '.
@@ -106,29 +107,10 @@ class LoginAction extends Action
 
         $nickname = common_canonical_nickname($this->trimmed('nickname'));
         $password = $this->arg('password');
-        if (common_check_user($nickname, $password)) {
-            // success!
-            if (!common_set_user($nickname)) {
-                $this->serverError(_('Error setting user.'));
-                return;
-            }
-            common_real_login(true);
-            if ($this->boolean('rememberme')) {
-                common_debug('Adding rememberme cookie for ' . $nickname);
-                common_rememberme();
-            }
-            // success!
-            $url = common_get_returnto();
-            if ($url) {
-                // We don't have to return to it again
-                common_set_returnto(null);
-            } else {
-                $url = common_local_url('all',
-                                        array('nickname' =>
-                                              $nickname));
-            }
-            common_redirect($url);
-        } else {
+
+        $user = common_check_user($nickname, $password);
+
+        if (!$user) {
             $this->showForm(_('Incorrect username or password.'));
             return;
         }
@@ -142,11 +124,11 @@ class LoginAction extends Action
         common_real_login(true);
 
         if ($this->boolean('rememberme')) {
-            common_debug('Adding rememberme cookie for ' . $nickname);
             common_rememberme($user);
         }
-        // success!
+
         $url = common_get_returnto();
+
         if ($url) {
             // We don't have to return to it again
             common_set_returnto(null);
@@ -155,6 +137,7 @@ class LoginAction extends Action
                                     array('nickname' =>
                                           $nickname));
         }
+
         common_redirect($url);
     }
 
diff --git a/actions/newgroup.php b/actions/newgroup.php
index 42fd380df..cbd8dfeec 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -142,13 +142,13 @@ class NewgroupAction extends Action
                                         array('http', 'https')))) {
             $this->showForm(_('Homepage is not a valid URL.'));
             return;
-        } else if (!is_null($fullname) && strlen($fullname) > 255) {
+        } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
             $this->showForm(_('Full name is too long (max 255 chars).'));
             return;
-        } else if (!is_null($description) && strlen($description) > 140) {
+        } else if (!is_null($description) && mb_strlen($description) > 140) {
             $this->showForm(_('description is too long (max 140 chars).'));
             return;
-        } else if (!is_null($location) && strlen($location) > 255) {
+        } else if (!is_null($location) && mb_strlen($location) > 255) {
             $this->showForm(_('Location is too long (max 255 chars).'));
             return;
         }
diff --git a/actions/newmessage.php b/actions/newmessage.php
index aa94f8c4f..82276ff34 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -2,7 +2,7 @@
 /**
  * Laconica, the distributed open-source microblogging tool
  *
- * Handler for posting new notices
+ * Handler for posting new messages
  *
  * PHP version 5
  *
@@ -28,9 +28,9 @@
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/
  */
- 
-if (!defined('LACONICA')) { 
-    exit(1); 
+
+if (!defined('LACONICA')) {
+    exit(1);
 }
 
 /**
@@ -47,13 +47,17 @@ if (!defined('LACONICA')) {
 
 class NewmessageAction extends Action
 {
-    
+
     /**
      * Error message, if any
      */
 
     var $msg = null;
 
+    var $content = null;
+    var $to = null;
+    var $other = null;
+
     /**
      * Title of the page
      *
@@ -61,12 +65,12 @@ class NewmessageAction extends Action
      *
      * @return string page title
      */
-     
+
     function title()
     {
         return _('New message');
     }
-    
+
     /**
      * Handle input, produce output
      *
@@ -74,7 +78,7 @@ class NewmessageAction extends Action
      *
      * @return void
      */
-    
+
     function handle($args)
     {
         parent::handle($args);
@@ -88,62 +92,85 @@ class NewmessageAction extends Action
         }
     }
 
-    function saveNewMessage()
+    function prepare($args)
     {
+        parent::prepare($args);
+
         $user = common_current_user();
-        assert($user); // XXX: maybe an error instead...
 
+        if (!$user) {
+            $this->clientError(_('Only logged-in users can send direct messages.'), 403);
+            return false;
+        }
+
+        $this->content = $this->trimmed('content');
+        $this->to = $this->trimmed('to');
+
+        if ($this->to) {
+
+            $this->other = User::staticGet('id', $this->to);
+
+            if (!$this->other) {
+                $this->clientError(_('No such user'), 404);
+                return false;
+            }
+
+            if (!$user->mutuallySubscribed($this->other)) {
+                $this->clientError(_('You can\'t send a message to this user.'), 404);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    function saveNewMessage()
+    {
         // CSRF protection
-        
+
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
             $this->showForm(_('There was a problem with your session token. ' .
                 'Try again, please.'));
             return;
         }
-        
-        $content = $this->trimmed('content');
-        $to      = $this->trimmed('to');
-        
-        if (!$content) {
+
+        $user = common_current_user();
+        assert($user); // XXX: maybe an error instead...
+
+        if (!$this->content) {
             $this->showForm(_('No content!'));
             return;
         } else {
-            $content_shortened = common_shorten_links($content);
+            $content_shortened = common_shorten_links($this->content);
 
             if (mb_strlen($content_shortened) > 140) {
-                common_debug("Content = '$content_shortened'", __FILE__);
-                common_debug("mb_strlen(\$content) = " . 
-                    mb_strlen($content_shortened),
-                    __FILE__);
                 $this->showForm(_('That\'s too long. ' .
                     'Max message size is 140 chars.'));
                 return;
             }
         }
 
-        $other = User::staticGet('id', $to);
-        
-        if (!$other) {
+        if (!$this->other) {
             $this->showForm(_('No recipient specified.'));
             return;
-        } else if (!$user->mutuallySubscribed($other)) {
+        } else if (!$user->mutuallySubscribed($this->other)) {
             $this->clientError(_('You can\'t send a message to this user.'), 404);
             return;
-        } else if ($user->id == $other->id) {
+        } else if ($user->id == $this->other->id) {
             $this->clientError(_('Don\'t send a message to yourself; ' .
                 'just say it to yourself quietly instead.'), 403);
             return;
         }
-        
-        $message = Message::saveNew($user->id, $other->id, $content, 'web');
-        
+
+        $message = Message::saveNew($user->id, $this->other->id, $this->content, 'web');
+
         if (is_string($message)) {
             $this->showForm($message);
             return;
         }
 
-        $this->notify($user, $other, $message);
+        $this->notify($user, $this->other, $message);
 
         $url = common_local_url('outbox', array('nickname' => $user->nickname));
 
@@ -152,31 +179,29 @@ class NewmessageAction extends Action
 
     function showForm($msg = null)
     {
-        $content = $this->trimmed('content');
-        $user    = common_current_user();
+        $this->msg = $msg;
 
-        $to = $this->trimmed('to');
-        
-        $other = User::staticGet('id', $to);
+        $this->showPage();
+    }
 
-        if (!$other) {
-            $this->clientError(_('No such user'), 404);
-            return;
+    function showPageNotice()
+    {
+        if ($this->msg) {
+            $this->element('p', 'error', $this->msg);
         }
-
-        if (!$user->mutuallySubscribed($other)) {
-            $this->clientError(_('You can\'t send a message to this user.'), 404);
-            return;
-        }        
-        
-        $this->msg = $msg;
-        
-        $this->showPage();
     }
-    
+
     function notify($from, $to, $message)
     {
         mail_notify_message($message, $from, $to);
         // XXX: Jabber, SMS notifications... probably queued
     }
+
+    // Do nothing (override)
+
+    function showNoticeForm()
+    {
+        $message_form = new MessageForm($this, $this->other, $this->content);
+        $message_form->show();
+    }
 }
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 572adbb23..cbd04c58b 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -90,7 +90,7 @@ class NewnoticeAction extends Action
             $this->clientError(_('Not logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 
-            // CSRF protection - token set in common_notice_form()
+            // CSRF protection
             $token = $this->trimmed('token');
             if (!$token || $token != common_session_token()) {
                 $this->clientError(_('There was a problem with your session token. '.
@@ -98,7 +98,12 @@ class NewnoticeAction extends Action
                 return;
             }
 
-            $this->saveNewNotice();
+            try {
+                $this->saveNewNotice();
+            } catch (Exception $e) {
+                $this->showForm($e->getMessage());
+                return;
+            }
         } else {
             $this->showForm();
         }
@@ -123,15 +128,13 @@ class NewnoticeAction extends Action
         $content = $this->trimmed('status_textarea');
 
         if (!$content) {
-            $this->showForm(_('No content!'));
-            return;
+            $this->clientError(_('No content!'));
         } else {
             $content_shortened = common_shorten_links($content);
 
             if (mb_strlen($content_shortened) > 140) {
-                $this->showForm(_('That\'s too long. '.
-                                  'Max notice size is 140 chars.'));
-                return;
+                $this->clientError(_('That\'s too long. '.
+                                     'Max notice size is 140 chars.'));
             }
         }
 
@@ -141,27 +144,32 @@ class NewnoticeAction extends Action
 
         if ($cmd) {
             if ($this->boolean('ajax')) {
-                $cmd->execute(new AjaxWebChannel());
+                $cmd->execute(new AjaxWebChannel($this));
             } else {
-                $cmd->execute(new WebChannel());
+                $cmd->execute(new WebChannel($this));
             }
             return;
         }
 
         $replyto = $this->trimmed('inreplyto');
+        #If an ID of 0 is wrongly passed here, it will cause a database error,
+        #so override it...
+        if ($replyto == 0) {
+            $replyto = 'false';
+        }
 
         $notice = Notice::saveNew($user->id, $content, 'web', 1,
                                   ($replyto == 'false') ? null : $replyto);
 
         if (is_string($notice)) {
-            $this->showForm($notice);
+            $this->clientError($notice);
             return;
         }
 
         common_broadcast_notice($notice);
 
         if ($this->boolean('ajax')) {
-            $this->startHTML('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             $this->element('title', null, _('Notice posted'));
             $this->elementEnd('head');
@@ -195,7 +203,7 @@ class NewnoticeAction extends Action
 
     function ajaxErrorMsg($msg)
     {
-        common_start_html('text/xml;charset=utf-8', true);
+        $this->startHTML('text/xml;charset=utf-8', true);
         $this->elementStart('head');
         $this->element('title', null, _('Ajax Error'));
         $this->elementEnd('head');
@@ -250,7 +258,7 @@ class NewnoticeAction extends Action
             }
         }
 
-        $notice_form = new NoticeForm($this, $content);
+        $notice_form = new NoticeForm($this, '', $content);
         $notice_form->show();
     }
 
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index a0d723b12..83e59dd9a 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -48,10 +48,20 @@ require_once INSTALLDIR.'/lib/searchaction.php';
  */
 class NoticesearchAction extends SearchAction
 {
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        common_set_returnto($this->selfUrl());
+
+        return true;
+    }
+
     /**
      * Get instructions
-     * 
-     * @return string instruction text 
+     *
+     * @return string instruction text
      */
     function getInstructions()
     {
@@ -60,7 +70,7 @@ class NoticesearchAction extends SearchAction
 
     /**
      * Get title
-     * 
+     *
      * @return string title
      */
     function title()
@@ -68,6 +78,20 @@ class NoticesearchAction extends SearchAction
         return _('Text search');
     }
 
+    function getFeeds()
+    {
+        $q = $this->trimmed('q');
+
+        if (!$q) {
+            return null;
+        }
+
+        return array(new Feed(Feed::RSS1, common_local_url('noticesearchrss',
+                                                           array('q' => $q)),
+                              sprintf(_('Search results for "%s" on %s'),
+                                      $q, common_config('site', 'name'))));
+    }
+
     /**
      * Show results
      *
@@ -89,151 +113,58 @@ class NoticesearchAction extends SearchAction
         } else {
             $cnt = $notice->find();
         }
-        if ($cnt > 0) {
-            $terms = preg_split('/[\s,]+/', $q);
-            $this->elementStart('ul', array('class' => 'notices'));
-            for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
-                if ($notice->fetch()) {
-                    $this->showNotice($notice, $terms);
-                } else {
-                    // shouldn't happen!
-                    break;
-                }
-            }
-            $this->elementEnd('ul');
-        } else {
+        if ($cnt === 0) {
             $this->element('p', 'error', _('No results'));
+            return;
         }
+        $terms = preg_split('/[\s,]+/', $q);
+        $nl = new SearchNoticeList($notice, $this, $terms);
 
-        $this->pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-                          $page, 'noticesearch', array('q' => $q));
-    }
+        $cnt = $nl->show();
 
-    /**
-     * Show header
-     *
-     * @param array $arr array containing the query
-     *
-     * @return void
-     */
+        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
+                          $this->page, 'noticesearch', array('q' => $q));
+    }
+    function isReadOnly()
+    {
+        return true;
+    }
+}
 
-    function extraHead()
+class SearchNoticeList extends NoticeList {
+    function __construct($notice, $out=null, $terms)
     {
-        $q = $this->trimmed('q');
-        if ($q) {
-            $this->element('link', array('rel' => 'alternate',
-                                         'href' => common_local_url('noticesearchrss',
-                                                                    array('q' => $q)),
-                                         'type' => 'application/rss+xml',
-                                         'title' => _('Search Stream Feed')));
-        }
+        parent::__construct($notice, $out);
+        $this->terms = $terms;
     }
 
-    /**
-     * Show notice
-     *
-     * @param class $notice notice
-     * @param array $terms  terms to highlight
-     *
-     * @return void
-     *
-     * @todo refactor and combine with StreamAction::showNotice()
-     */
-    function showNotice($notice, $terms)
+    function newListItem($notice)
     {
-        $profile = $notice->getProfile();
-        if (!$profile) {
-            common_log_db_error($notice, 'SELECT', __FILE__);
-            $this->serverError(_('Notice without matching profile'));
-            return;
-        }
-        // XXX: RDFa
-        $this->elementStart('li', array('class' => 'hentry notice',
-                                          'id' => 'notice-' . $notice->id));
+        return new SearchNoticeListItem($notice, $this->out, $this->terms);
+    }
+}
 
-        $this->elementStart('div', 'entry-title');
-        $this->elementStart('span', 'vcard author');
-        $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
-        $this->elementStart('a', array('href' => $profile->profileurl));
-        $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
-                                    'class' => 'avatar photo',
-                                    'width' => AVATAR_STREAM_SIZE,
-                                    'height' => AVATAR_STREAM_SIZE,
-                                    'alt' =>
-                                    ($profile->fullname) ? $profile->fullname :
-                                    $profile->nickname));
-        $this->element('span', 'nickname fn', $profile->nickname);
-        $this->elementEnd('a');
-        $this->elementEnd('span');
+class SearchNoticeListItem extends NoticeListItem {
+    function __construct($notice, $out=null, $terms)
+    {
+        parent::__construct($notice, $out);
+        $this->terms = $terms;
+    }
 
+    function showContent()
+    {
         // FIXME: URL, image, video, audio
-        $this->elementStart('p', array('class' => 'entry-content'));
-        if ($notice->rendered) {
-            $this->raw($this->highlight($notice->rendered, $terms));
+        $this->out->elementStart('p', array('class' => 'entry-content'));
+        if ($this->notice->rendered) {
+            $this->out->raw($this->highlight($this->notice->rendered, $this->terms));
         } else {
             // XXX: may be some uncooked notices in the DB,
             // we cook them right now. This should probably disappear in future
             // versions (>> 0.4.x)
-            $this->raw($this->highlight(common_render_content($notice->content, $notice), $terms));
+            $this->out->raw($this->highlight(common_render_content($this->notice->content, $this->notice), $this->terms));
         }
-        $this->elementEnd('p');
-        $this->elementEnd('div');
-
-        $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
-        $this->elementStart('div', 'entry-content');
-        $this->elementStart('dl', 'timestamp');
-        $this->element('dt', null, _('Published'));
-        $this->elementStart('dd', null);
-        $this->elementStart('a', array('rel' => 'bookmark',
-                                       'href' => $noticeurl));
-        $dt = common_date_iso8601($notice->created);
-        $this->element('abbr', array('class' => 'published',
-                                          'title' => $dt),
-                            common_date_string($notice->created));
-        $this->elementEnd('a');
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
-
-        if ($notice->reply_to) {
-            $replyurl = common_local_url('shownotice',
-                                         array('notice' => $this->notice->reply_to));
-            $this->elementStart('dl', 'response');
-            $this->element('dt', null, _('To'));
-            $this->elementStart('dd');
-            $this->element('a', array('href' => $replyurl,
-                                           'rel' => 'in-reply-to'),
-                                _('in reply to'));
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
-        }
-        $this->elementEnd('div');
-
-        $this->elementStart('div', 'notice-options');
+        $this->out->elementEnd('p');
 
-        $reply_url = common_local_url('newnotice',
-                                      array('replyto' => $profile->nickname));
-
-        $this->elementStart('dl', 'notice_reply');
-        $this->element('dt', null, _('Reply to this notice'));
-        $this->elementStart('dd');
-        $this->elementStart('a', array('href' => $reply_url,
-                                       'title' => _('Reply to this notice')));
-        $this->text(_('Reply'));
-        $this->element('span', 'notice_id', $notice->id);
-        $this->elementEnd('a');
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
-
-        $this->elementStart('a',
-                             array('href' => common_local_url('newnotice',
-                                                              array('replyto' => $profile->nickname)),
-                                   'onclick' => 'doreply("'.$profile->nickname.'"); return false',
-                                   'title' => _('reply'),
-                                   'class' => 'replybutton'));
-        $this->hidden('posttoken', common_session_token());
-        $this->elementEnd('a');
-        $this->elementEnd('div');
-        $this->elementEnd('li');
     }
 
     /**
@@ -246,7 +177,7 @@ class NoticesearchAction extends SearchAction
      */
     function highlight($text, $terms)
     {
-        /* Highligh serach terms */
+        /* Highligh search terms */
         $pattern = '/('.implode('|', array_map('htmlspecialchars', $terms)).')/i';
         $result  = preg_replace($pattern, '<strong>\\1</strong>', $text);
 
@@ -257,10 +188,5 @@ class NoticesearchAction extends SearchAction
         } while ($count);
         return $result;
     }
-
-    function isReadOnly()
-    {
-        return true;
-    }
 }
 
diff --git a/actions/nudge.php b/actions/nudge.php
index ca7947f5a..bc3d48478 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -89,7 +89,7 @@ class NudgeAction extends Action
         $this->notify($user, $other);
 
         if ($this->boolean('ajax')) {
-            $this->startHTML('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             $this->element('title', null, _('Nudge sent'));
             $this->elementEnd('head');
diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 7a267a2bd..1a4372d73 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -26,7 +26,7 @@ class OpenidloginAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        if (common_logged_in()) {
+        if (common_is_real_login()) {
             $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $openid_url = $this->trimmed('openid_url');
@@ -59,7 +59,16 @@ class OpenidloginAction extends Action
 
     function getInstructions()
     {
-        return _('Login with an [OpenID](%%doc.openid%%) account.');
+        if (common_logged_in() && !common_is_real_login() &&
+            common_get_returnto()) {
+            // rememberme logins have to reauthenticate before
+            // changing any profile settings (cookie-stealing protection)
+            return _('For security reasons, please re-login with your ' .
+                     '[OpenID](%%doc.openid%%) ' .
+                     'before changing your settings.');
+        } else {
+            return _('Login with an [OpenID](%%doc.openid%%) account.');
+        }
     }
 
     function showPageNotice()
diff --git a/actions/opensearch.php b/actions/opensearch.php
index 7709249bb..2eb818306 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -67,7 +67,7 @@ class OpensearchAction extends Action
             $short_name = _('Notice Search');
         }
         header('Content-Type: text/html');
-        common_start_xml();
+        $this->startXML();
         $this->elementStart('OpenSearchDescription', array('xmlns' => 'http://a9.com/-/spec/opensearch/1.1/'));
         $short_name =  common_config('site', 'name').' '.$short_name;
         $this->element('ShortName', null, $short_name);
@@ -81,7 +81,7 @@ class OpensearchAction extends Action
         $this->element('OutputEncoding', null, 'UTF-8');
         $this->element('InputEncoding', null, 'UTF-8');
         $this->elementEnd('OpenSearchDescription');
-        common_end_xml();
+        $this->endXML();
     }
 
     function isReadOnly()
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 17b2de4e8..bdce61035 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -84,7 +84,7 @@ class PasswordsettingsAction extends AccountSettingsAction
                                           'id' => 'form_password',
                                           'class' => 'form_settings',
                                           'action' =>
-                                          common_local_url('profilesettings')));
+                                          common_local_url('passwordsettings')));
         $this->elementStart('fieldset');
         $this->element('legend', null, _('Password change'));
         $this->hidden('token', common_session_token());
@@ -141,7 +141,12 @@ class PasswordsettingsAction extends AccountSettingsAction
         $newpassword = $this->arg('newpassword');
         $confirm     = $this->arg('confirm');
 
-        if (0 != strcmp($newpassword, $confirm)) {
+        # Some validation
+
+        if (strlen($newpassword) < 6) {
+            $this->showForm(_('Password must be 6 or more characters.'));
+            return;
+        } else if (0 != strcmp($newpassword, $confirm)) {
             $this->showForm(_('Passwords don\'t match.'));
             return;
         }
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 615201c46..14177fcf0 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -86,33 +86,9 @@ class PeoplesearchAction extends SearchAction
         }
 
         $profile->free();
-        
+
         $this->pagination($page > 1, $cnt > PROFILES_PER_PAGE,
                           $page, 'peoplesearch', array('q' => $q));
     }
 }
 
-class PeopleSearchResults extends ProfileList
-{
-    var $terms = null;
-    var $pattern = null;
-    
-    function __construct($profile, $terms, $action)
-    {
-        parent::__construct($profile, $terms, $action);
-        $this->terms = array_map('preg_quote', 
-                                 array_map('htmlspecialchars', $terms));
-        $this->pattern = '/('.implode('|',$terms).')/i';
-    }
-    
-    function highlight($text)
-    {
-        return preg_replace($this->pattern, '<strong>\\1</strong>', htmlspecialchars($text));
-    }
-
-    function isReadOnly()
-    {
-        return true;
-    }
-}
-
diff --git a/actions/peopletag.php b/actions/peopletag.php
index 7bcfcb93e..6b1e34f1a 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Action for showing profiles self-tagged with a given tag
+ *
+ * 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.
@@ -15,95 +18,131 @@
  *
  * 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   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/profilelist.php';
 
-require_once(INSTALLDIR.'/lib/profilelist.php');
+/**
+ * This class outputs a paginated list of profiles self-tagged with a given tag
+ *
+ * @category Output
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      Action
+ */
 
 class PeopletagAction extends Action
 {
-    
-    function handle($args)
+
+    var $tag  = null;
+    var $page = null;
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+    function prepare($argarray)
     {
+        parent::prepare($argarray);
 
-        parent::handle($args);
+        $this->tag = $this->trimmed('tag');
 
-        $tag = $this->trimmed('tag');
-        
-        if (!common_valid_profile_tag($tag)) {
-            $this->clientError(sprintf(_('Not a valid people tag: %s'), $tag));
+        if (!common_valid_profile_tag($this->tag)) {
+            $this->clientError(sprintf(_('Not a valid people tag: %s'),
+                $this->tag));
             return;
         }
 
-        $page = $this->trimmed('page');
-        
-        if (!$page) {
-            $page = 1;
-        }
-        
-        # Looks like we're good; show the header
+        $this->page = ($this->arg('page')) ? $this->arg('page') : 1;
 
-        common_show_header(sprintf(_('Users self-tagged with %s - page %d'), $tag, $page),
-                           null, $tag, array($this, 'show_top'));
+        common_set_returnto($this->selfUrl());
 
-        $this->show_people($tag, $page);
+        return true;
+    }
 
-        common_show_footer();
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return boolean is read only action?
+     */
+    function handle($argarray)
+    {
+        parent::handle($argarray);
+        $this->showPage();
     }
 
-    function show_people($tag, $page)
+    /**
+     * Whips up a query to get a list of profiles based on the provided
+     * people tag and page, initalizes a ProfileList widget, and displays
+     * it to the user.
+     *
+     * @return nothing
+     */
+    function showContent()
     {
-        
+
         $profile = new Profile();
 
-        $offset = ($page-1)*PROFILES_PER_PAGE;
-        $limit = PROFILES_PER_PAGE + 1;
-        
-        if (common_config('db','type') == 'pgsql') {
+        $offset = ($this->page - 1) * PROFILES_PER_PAGE;
+        $limit  = PROFILES_PER_PAGE + 1;
+
+        if (common_config('db', 'type') == 'pgsql') {
             $lim = ' LIMIT ' . $limit . ' OFFSET ' . $offset;
         } else {
             $lim = ' LIMIT ' . $offset . ', ' . $limit;
         }
 
-        # XXX: memcached this
-        
-        $profile->query(sprintf('SELECT profile.* ' .
-                                'FROM profile JOIN profile_tag ' .
-                                'ON profile.id = profile_tag.tagger ' .
-                                'WHERE profile_tag.tagger = profile_tag.tagged ' .
-                                'AND tag = "%s" ' .
-                                'ORDER BY profile_tag.modified DESC ' . 
-                                $lim, $tag));
-
-        $pl = new ProfileList($profile);
-        $cnt = $pl->show_list();
-        
-        common_pagination($page > 1,
+        // XXX: memcached this
+
+        $qry =  'SELECT profile.* ' .
+                'FROM profile JOIN profile_tag ' .
+                'ON profile.id = profile_tag.tagger ' .
+                'WHERE profile_tag.tagger = profile_tag.tagged ' .
+                'AND tag = "%s" ' .
+                'ORDER BY profile_tag.modified DESC%s';
+
+        $profile->query(sprintf($qry, $this->tag, $lim));
+
+        $pl  = new ProfileList($profile, null, $this);
+        $cnt = $pl->show();
+
+        $this->pagination($this->page > 1,
                           $cnt > PROFILES_PER_PAGE,
-                          $page,
-                          $this->trimmed('action'),
-                          array('tag' => $tag));
-    }
-    
-    function show_top($tag)
-    {
-        $instr = sprintf(_('These are users who have tagged themselves "%s" ' .
-                           'to show a common interest, characteristic, hobby or job.'), $tag);
-        $this->elementStart('div', 'instructions');
-        $this->elementStart('p');
-        $this->text($instr);
-        $this->elementEnd('p');
-        $this->elementEnd('div');
+                          $this->page,
+                          'peopletag',
+                          array('tag' => $this->tag));
     }
 
-    function get_title()
+    /**
+     * Returns the page title
+     *
+     * @return string page title
+     */
+    function title()
     {
-        return null;
+        return sprintf(_('Users self-tagged with %s - page %d'),
+            $this->tag, $this->page);
     }
 
-    function show_header($arr)
-    {
-        return;
-    }
 }
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 6dd4775e5..60f7c0796 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -83,7 +83,7 @@ class ProfilesettingsAction extends AccountSettingsAction
         $user = common_current_user();
         $profile = $user->getProfile();
 
-        $this->elementStart('form', array('method' => 'POST',
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'form_settings_profile',
                                            'class' => 'form_settings',
                                            'action' => common_local_url('profilesettings')));
@@ -198,13 +198,13 @@ class ProfilesettingsAction extends AccountSettingsAction
                    !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
             $this->showForm(_('Homepage is not a valid URL.'));
             return;
-        } else if (!is_null($fullname) && strlen($fullname) > 255) {
+        } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
             $this->showForm(_('Full name is too long (max 255 chars).'));
             return;
-        } else if (!is_null($bio) && strlen($bio) > 140) {
+        } else if (!is_null($bio) && mb_strlen($bio) > 140) {
             $this->showForm(_('Bio is too long (max 140 chars).'));
             return;
-        } else if (!is_null($location) && strlen($location) > 255) {
+        } else if (!is_null($location) && mb_strlen($location) > 255) {
             $this->showForm(_('Location is too long (max 255 chars).'));
             return;
         }  else if (is_null($timezone) || !in_array($timezone, DateTimeZone::listIdentifiers())) {
diff --git a/actions/public.php b/actions/public.php
index cfdc99bb3..a20ae4032 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -73,6 +73,9 @@ class PublicAction extends Action
     {
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
@@ -116,12 +119,20 @@ class PublicAction extends Action
      * @return void
      */
 
-    function showFeeds()
+    function getFeeds()
     {
-        $this->element('link', array('rel' => 'alternate',
-                                     'href' => common_local_url('publicrss'),
-                                     'type' => 'application/rss+xml',
-                                     'title' => _('Public Stream Feed')));
+        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')),
+                              _('Public Stream Feed (RSS 2.0)')),
+                     new Feed(Feed::ATOM,
+                              common_local_url('api',
+                                               array('apiaction' => 'statuses',
+                                                     'method' => 'public_timeline.atom')),
+                              _('Public Stream Feed (Atom)')));
     }
 
     /**
@@ -182,27 +193,6 @@ class PublicAction extends Action
                           $this->page, 'public');
     }
 
-    /**
-     * Makes a list of exported feeds for this page
-     *
-     * @return void
-     *
-     * @todo I18N
-     */
-
-    function showExportData()
-    {
-        $fl = new FeedList($this);
-        $fl->show(array(0 => array('href' => common_local_url('publicrss'),
-                                   'type' => 'rss',
-                                   'version' => 'RSS 1.0',
-                                   'item' => 'publicrss'),
-                        1 => array('href' => common_local_url('publicatom'),
-                                   'type' => 'atom',
-                                   'version' => 'Atom 1.0',
-                                   'item' => 'publicatom')));
-    }
-
     function showSections()
     {
         // $top = new TopPostersSection($this);
diff --git a/actions/register.php b/actions/register.php
index a63da2e0f..5d7a8ce69 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -167,13 +167,13 @@ class RegisterAction extends Action
                                         array('http', 'https')))) {
             $this->showForm(_('Homepage is not a valid URL.'));
             return;
-        } else if (!is_null($fullname) && strlen($fullname) > 255) {
+        } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
             $this->showForm(_('Full name is too long (max 255 chars).'));
             return;
-        } else if (!is_null($bio) && strlen($bio) > 140) {
+        } else if (!is_null($bio) && mb_strlen($bio) > 140) {
             $this->showForm(_('Bio is too long (max 140 chars).'));
             return;
-        } else if (!is_null($location) && strlen($location) > 255) {
+        } else if (!is_null($location) && mb_strlen($location) > 255) {
             $this->showForm(_('Location is too long (max 255 chars).'));
             return;
         } else if (strlen($password) < 6) {
@@ -252,14 +252,14 @@ class RegisterAction extends Action
     function showPageTitle() {
         $this->element('h1', array('class' => 'entry-title'), $this->title());
     }
-    
+
     // overrided to add hentry, and content-inner class
     function showContentBlock()
      {
          $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
          $this->showPageTitle();
          $this->showPageNoticeBlock();
-         $this->elementStart('div', array('id' => 'content_inner', 
+         $this->elementStart('div', array('id' => 'content_inner',
              'class' => 'entry-content'));
          // show the actual content (forms, lists, whatever)
          $this->showContent();
@@ -426,11 +426,13 @@ class RegisterAction extends Action
         }
         $this->elementStart('li');
         $this->element('input', $attrs);
+        $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license'));
         $this->text(_('My text and files are available under '));
         $this->element('a', array('href' => common_config('license', 'url')),
-                       $config['license']['title']);
+                       common_config('license', 'title'), _("Creative Commons Attribution 3.0"));
         $this->text(_(' except this private data: password, '.
-                      'email address, IM address, phone number.'));
+                      'email address, IM address, and phone number.'));
+        $this->elementEnd('label');
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('submit', _('Register'));
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index f727a63b8..7ea7acd6d 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -321,8 +321,7 @@ class RemotesubscribeAction extends Action
 
         $result = $fetcher->post($req->get_normalized_http_url(),
                                  $req->to_postdata(),
-                                 array('User-Agent' => 'Laconica/' . LACONICA_VERSION));
-
+                                 array('User-Agent: Laconica/' . LACONICA_VERSION));
         if ($result->status != 200) {
             return null;
         }
diff --git a/actions/replies.php b/actions/replies.php
index 9ec373a96..4ab9b14ed 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -83,6 +83,8 @@ class RepliesAction extends Action
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
@@ -127,16 +129,13 @@ class RepliesAction extends Action
      * @return void
      */
 
-    function showFeeds()
+    function getFeeds()
     {
         $rssurl   = common_local_url('repliesrss',
                                      array('nickname' => $this->user->nickname));
         $rsstitle = sprintf(_('Feed for replies to %s'), $this->user->nickname);
 
-        $this->element('link', array('rel' => 'alternate',
-                                     'href' => $rssurl,
-                                     'type' => 'application/rss+xml',
-                                     'title' => $rsstitle));
+        return array(new Feed(Feed::RSS1, $rssurl, $rsstitle));
     }
 
     /**
@@ -152,25 +151,6 @@ class RepliesAction extends Action
     }
 
     /**
-     * Show the replies feed links
-     *
-     * @return void
-     */
-
-    function showExportData()
-    {
-        $fl = new FeedList($this);
-
-        $rssurl = common_local_url('repliesrss',
-                                   array('nickname' => $this->user->nickname));
-
-        $fl->show(array(0=>array('href'=> $rssurl,
-                                 'type' => 'rss',
-                                 'version' => 'RSS 1.0',
-                                 'item' => 'repliesrss')));
-    }
-
-    /**
      * Show the content
      *
      * A list of notices that are replies to the user, plus pagination.
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index bb68f8d94..d1c9283f0 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -112,6 +112,8 @@ class ShowfavoritesAction extends Action
             $this->page = 1;
         }
 
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
@@ -134,10 +136,10 @@ class ShowfavoritesAction extends Action
     /**
      * Feeds for the <head> section
      *
-     * @return void
+     * @return array Feed objects to show
      */
 
-    function showFeeds()
+    function getFeeds()
     {
         $feedurl   = common_local_url('favoritesrss',
                                       array('nickname' =>
@@ -145,10 +147,7 @@ class ShowfavoritesAction extends Action
         $feedtitle = sprintf(_('Feed for favorites of %s'),
                              $this->user->nickname);
 
-        $this->element('link', array('rel' => 'alternate',
-                                     'href' => $feedurl,
-                                     'type' => 'application/rss+xml',
-                                     'title' => $feedtitle));
+        return array(new Feed(Feed::RSS1, $feedurl, $feedtitle));
     }
 
     /**
@@ -164,28 +163,6 @@ class ShowfavoritesAction extends Action
     }
 
     /**
-     * Show the replies feed links
-     *
-     * @return void
-     */
-
-    function showExportData()
-    {
-        $feedurl = common_local_url('favoritesrss',
-                                    array('nickname' =>
-                                          $this->user->nickname));
-
-        $fl = new FeedList($this);
-
-        // XXX: I18N
-
-        $fl->show(array(0=>array('href'=> $feedurl,
-                                 'type' => 'rss',
-                                 'version' => 'RSS 1.0',
-                                 'item' => 'Favorites')));
-    }
-
-    /**
      * Show the content
      *
      * A list of notices that this user has marked as a favorite
diff --git a/actions/showgroup.php b/actions/showgroup.php
index 99367a97c..c20941a35 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -129,6 +129,8 @@ class ShowgroupAction extends Action
             return false;
         }
 
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
@@ -242,7 +244,7 @@ class ShowgroupAction extends Action
         if ($this->group->location) {
             $this->elementStart('dl', 'entity_location');
             $this->element('dt', null, _('Location'));
-            $this->element('dd', 'location', $this->group->location);
+            $this->element('dd', 'label', $this->group->location);
             $this->elementEnd('dl');
         }
 
@@ -269,7 +271,7 @@ class ShowgroupAction extends Action
         $this->elementStart('div', 'entity_actions');
         $this->element('h2', null, _('Group actions'));
         $this->elementStart('ul');
-        $this->elementStart('li', array('id' => 'entity_subscribe'));
+        $this->elementStart('li', 'entity_subscribe');
         $cur = common_current_user();
         if ($cur) {
             if ($cur->isMember($this->group)) {
@@ -290,37 +292,18 @@ class ShowgroupAction extends Action
     }
 
     /**
-     * Show a list of links to feeds this page produces
-     *
-     * @return void
-     */
-
-    function showExportData()
-    {
-        $fl = new FeedList($this);
-        $fl->show(array(0=>array('href'=>common_local_url('grouprss',
-                                                          array('nickname' => $this->group->nickname)),
-                                 'type' => 'rss',
-                                 'version' => 'RSS 1.0',
-                                 'item' => 'notices')));
-    }
-
-    /**
-     * Show a list of links to feeds this page produces
+     * Get a list of the feeds for this page
      *
      * @return void
      */
 
-    function showFeeds()
+    function getFeeds()
     {
         $url =
           common_local_url('grouprss',
                            array('nickname' => $this->group->nickname));
 
-        $this->element('link', array('rel' => 'alternate',
-                                     'href' => $url,
-                                     'type' => 'application/rss+xml',
-                                     'title' => sprintf(_('Notice feed for %s group'),
+        return array(new Feed(Feed::RSS1, $url, sprintf(_('Notice feed for %s group'),
                                                         $this->group->nickname)));
     }
 
@@ -333,6 +316,7 @@ class ShowgroupAction extends Action
     function showSections()
     {
         $this->showMembers();
+        $this->showStatistics();
         $cloud = new GroupTagCloudSection($this, $this->group);
         $cloud->show();
     }
@@ -356,12 +340,10 @@ class ShowgroupAction extends Action
 
         $this->element('h2', null, _('Members'));
 
-        if ($member) {
-            $pml = new ProfileMiniList($member, null, $this);
-            $cnt = $pml->show();
-            if ($cnt == 0) {
-                $this->element('p', null, _('(None)'));
-            }
+        $pml = new ProfileMiniList($member, null, $this);
+        $cnt = $pml->show();
+        if ($cnt == 0) {
+             $this->element('p', null, _('(None)'));
         }
 
         if ($cnt == MEMBERS_PER_SECTION) {
@@ -373,6 +355,41 @@ class ShowgroupAction extends Action
         $this->elementEnd('div');
     }
 
+    /**
+     * Show some statistics
+     *
+     * @return void
+     */
+
+    function showStatistics()
+    {
+        // XXX: WORM cache this
+        $members = $this->group->getMembers();
+        $members_count = 0;
+        /** $member->count() doesn't work. */
+        while ($members->fetch()) {
+            $members_count++;
+        }
+
+        $this->elementStart('div', array('id' => 'entity_statistics',
+                                         'class' => 'section'));
+
+        $this->element('h2', null, _('Statistics'));
+
+        $this->elementStart('dl', 'entity_created');
+        $this->element('dt', null, _('Created'));
+        $this->element('dd', null, date('j M Y',
+                                                 strtotime($this->group->created)));
+        $this->elementEnd('dl');
+
+        $this->elementStart('dl', 'entity_members');
+        $this->element('dt', null, _('Members'));
+        $this->element('dd', null, (is_int($members_count)) ? $members_count : '0');
+        $this->elementEnd('dl');
+
+        $this->elementEnd('div');
+    }
+
     function showAnonymousMessage()
     {
 		$m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
diff --git a/actions/showstream.php b/actions/showstream.php
index eab1fc0a2..65482167e 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -110,6 +110,8 @@ class ShowstreamAction extends Action
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
@@ -140,7 +142,12 @@ class ShowstreamAction extends Action
 
     function showPageTitle()
     {
-         $this->element('h1', NULL, $this->profile->nickname._("'s profile"));
+        $user =& common_current_user();
+        if ($user && ($user->id == $this->profile->id)) {
+            $this->element('h1', NULL, _("Your profile"));
+        } else {
+            $this->element('h1', NULL, sprintf(_('%s\'s profile'), $this->profile->nickname));
+        }
     }
 
     function showPageNoticeBlock()
@@ -148,62 +155,39 @@ class ShowstreamAction extends Action
         return;
     }
 
-    function showExportData()
-    {
-        $fl = new FeedList($this);
-        $fl->show(array(0=>array('href'=>common_local_url('userrss',
-                                                          array('nickname' => $this->user->nickname)),
-                                 'type' => 'rss',
-                                 'version' => 'RSS 1.0',
-                                 'item' => 'notices'),
-                        1=>array('href'=>common_local_url('usertimeline',
-                                                          array('nickname' => $this->user->nickname)),
-                                 'type' => 'atom',
-                                 'version' => 'Atom 1.0',
-                                 'item' => 'usertimeline'),
-                        2=>array('href'=>common_local_url('foaf',
-                                                          array('nickname' => $this->user->nickname)),
-                                 'type' => 'rdf',
-                                 'version' => 'FOAF',
-                                 'item' => 'foaf')));
-    }
-
-    function showFeeds()
+    function getFeeds()
     {
-        // Feeds
-        $this->element('link', array('rel' => 'alternate',
-                                     'href' => common_local_url('api',
-                                                                array('apiaction' => 'statuses',
-                                                                      'method' => 'entity_timeline.rss',
-                                                                      'argument' => $this->user->nickname)),
-                                     'type' => 'application/rss+xml',
-                                     'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
-        $this->element('link', array('rel' => 'alternate feed',
-                                     'href' => common_local_url('api',
-                                                                array('apiaction' => 'statuses',
-                                                                      'method' => 'entity_timeline.atom',
-                                                                      'argument' => $this->user->nickname)),
-                                     'type' => 'application/atom+xml',
-                                     'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
-        $this->element('link', array('rel' => 'alternate',
-                                     'href' => common_local_url('userrss', array('nickname' =>
-                                                                               $this->user->nickname)),
-                                     'type' => 'application/rdf+xml',
-                                     'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
+        return array(new Feed(Feed::RSS1,
+                              common_local_url('userrss',
+                                               array('nickname' => $this->user->nickname)),
+                              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')),
+                              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')),
+                              sprintf(_('Notice feed for %s (Atom)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::FOAF,
+                              common_local_url('foaf', array('nickname' =>
+                                                             $this->user->nickname)),
+                              sprintf(_('FOAF for %s'), $this->user->nickname)));
     }
 
     function extraHead()
     {
-        // FOAF
-        $this->element('link', array('rel' => 'meta',
-                                     'href' => common_local_url('foaf', array('nickname' =>
-                                                                              $this->user->nickname)),
-                                     'type' => 'application/rdf+xml',
-                                     'title' => 'FOAF'));
         // for remote subscriptions etc.
         $this->element('meta', array('http-equiv' => 'X-XRDS-Location',
                                      'content' => common_local_url('xrds', array('nickname' =>
-                                                                               $this->user->nickname))));
+                                                                                 $this->user->nickname))));
 
         if ($this->profile->bio) {
             $this->element('meta', array('name' => 'description',
@@ -239,12 +223,21 @@ class ShowstreamAction extends Action
         $this->elementStart('dl', 'entity_depiction');
         $this->element('dt', null, _('Photo'));
         $this->elementStart('dd');
-        $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
+        $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');
 
         $this->elementStart('dl', 'entity_nickname');
@@ -253,7 +246,7 @@ class ShowstreamAction extends Action
         $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->profile->nickname);
         $this->elementEnd('dd');
         $this->elementEnd('dl');
 
@@ -269,7 +262,7 @@ class ShowstreamAction extends Action
         if ($this->profile->location) {
             $this->elementStart('dl', 'entity_location');
             $this->element('dt', null, _('Location'));
-            $this->element('dd', 'location', $this->profile->location);
+            $this->element('dd', 'label', $this->profile->location);
             $this->elementEnd('dl');
         }
 
@@ -299,11 +292,11 @@ class ShowstreamAction extends Action
             $this->elementStart('ul', 'tags xoxo');
             foreach ($tags as $tag) {
                 $this->elementStart('li');
-                $this->element('span', 'mark_hash', '#');
-                $this->element('a', array('rel' => 'tag',
-                                          'href' => common_local_url('peopletag',
-                                                                     array('tag' => $tag))),
-                               $tag);
+                // 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');
@@ -312,14 +305,22 @@ class ShowstreamAction extends Action
         }
         $this->elementEnd('div');
 
-        //XXX: entity_actions doesn't need to be outputted if entity is looking at their own profile
         $this->elementStart('div', 'entity_actions');
         $this->element('h2', null, _('User actions'));
         $this->elementStart('ul');
-        $this->elementStart('li', array('class' => 'entity_subscribe'));
         $cur = common_current_user();
+
+        if ($cur && $cur->id == $this->profile->id) {
+            $this->elementStart('li', 'entity_edit');
+            $this->element('a', array('href' => common_local_url('profilesettings'),
+                                      'title' => _('Edit profile settings')),
+                           _('Edit'));
+            $this->elementEnd('li');
+        }
+
         if ($cur) {
             if ($cur->id != $this->profile->id) {
+                $this->elementStart('li', 'entity_subscribe');
                 if ($cur->isSubscribed($this->profile)) {
                     $usf = new UnsubscribeForm($this, $this->profile);
                     $usf->show();
@@ -327,24 +328,23 @@ class ShowstreamAction extends Action
                     $sf = new SubscribeForm($this, $this->profile);
                     $sf->show();
                 }
+                $this->elementEnd('li');
             }
         } else {
+            $this->elementStart('li', 'entity_subscribe');
             $this->showRemoteSubscribeLink();
+            $this->elementEnd('li');
         }
-        $this->elementEnd('li');
 
-//        common_profile_new_message_nudge($cur, $this->user, $this->profile);
-
-        $user = User::staticGet('id', $this->profile->id);
         if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) {
-           $this->elementStart('li', array('class' => 'entity_send-a-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');
 
             if ($user->email && $user->emailnotifynudge) {
-                $this->elementStart('li', array('class' => 'entity_nudge'));
+                $this->elementStart('li', 'entity_nudge');
                 $nf = new NudgeForm($this, $user);
                 $nf->show();
                 $this->elementEnd('li');
@@ -353,7 +353,7 @@ class ShowstreamAction extends Action
 
         if ($cur && $cur->id != $this->profile->id) {
             $blocked = $cur->hasBlocked($this->profile);
-            $this->elementStart('li', array('class' => 'entity_block'));
+            $this->elementStart('li', 'entity_block');
             if ($blocked) {
                 $ubf = new UnblockForm($this, $this->profile);
                 $ubf->show();
@@ -479,7 +479,7 @@ class ShowstreamAction extends Action
         $this->elementStart('dl', 'entity_member-since');
         $this->element('dt', null, _('Member since'));
         $this->element('dd', null, date('j M Y',
-                                                 strtotime($this->profile->created)));
+                                        strtotime($this->profile->created)));
         $this->elementEnd('dl');
 
         $this->elementStart('dl', 'entity_subscriptions');
diff --git a/actions/smssettings.php b/actions/smssettings.php
index f89cbe1ab..a5f75d266 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -490,4 +490,55 @@ class SmssettingsAction extends ConnectSettingsAction
         common_redirect(common_local_url('confirmaddress',
                                          array('code' => $code)));
     }
+
+    /**
+     * Handle a request to remove an incoming email address
+     *
+     * @return void
+     */
+
+    function removeIncoming()
+    {
+        $user = common_current_user();
+
+        if (!$user->incomingemail) {
+            $this->showForm(_('No incoming email address.'));
+            return;
+        }
+
+        $orig = clone($user);
+
+        $user->incomingemail = null;
+
+        if (!$user->updateKeys($orig)) {
+            common_log_db_error($user, 'UPDATE', __FILE__);
+            $this->serverError(_("Couldn't update user record."));
+        }
+
+        $this->showForm(_('Incoming email address removed.'), true);
+    }
+
+    /**
+     * Generate a new incoming email address
+     *
+     * @return void
+     *
+     * @see Emailsettings::newIncoming
+     */
+
+    function newIncoming()
+    {
+        $user = common_current_user();
+
+        $orig = clone($user);
+
+        $user->incomingemail = mail_new_incoming_address();
+
+        if (!$user->updateKeys($orig)) {
+            common_log_db_error($user, 'UPDATE', __FILE__);
+            $this->serverError(_("Couldn't update user record."));
+        }
+
+        $this->showForm(_('New incoming email address added.'), true);
+    }
 }
diff --git a/actions/subscribe.php b/actions/subscribe.php
index 171332734..f761992de 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -64,7 +64,7 @@ class SubscribeAction extends Action
         }
 
         if ($this->boolean('ajax')) {
-            $this->startHTML('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             $this->element('title', null, _('Subscribed'));
             $this->elementEnd('head');
diff --git a/actions/subscribers.php b/actions/subscribers.php
index fb8733c77..22faafaef 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -72,9 +72,13 @@ class SubscribersAction extends GalleryAction
 
     function showContent()
     {
+        parent::showContent();
+
         $offset = ($this->page-1) * PROFILES_PER_PAGE;
         $limit =  PROFILES_PER_PAGE + 1;
 
+        $cnt = 0;
+
         if ($this->tag) {
             $subscribers = $this->user->getTaggedSubscribers($this->tag, $offset, $limit);
         } else {
@@ -83,7 +87,7 @@ class SubscribersAction extends GalleryAction
 
         if ($subscribers) {
             $subscribers_list = new SubscribersList($subscribers, $this->user, $this);
-            $subscribers_list->show();
+            $cnt = $subscribers_list->show();
         }
 
         $subscribers->free();
@@ -96,9 +100,9 @@ class SubscribersAction extends GalleryAction
 
 class SubscribersList extends ProfileList
 {
-    function showOwnerControls($profile)
+    function showBlockForm()
     {
-        $bf = new BlockForm($this->out, $profile,
+        $bf = new BlockForm($this->out, $this->profile,
                             array('action' => 'subscribers',
                                   'nickname' => $this->owner->nickname));
         $bf->show();
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index d7ba0d624..3fbea2039 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -84,6 +84,8 @@ class SubscriptionsAction extends GalleryAction
         $offset = ($this->page-1) * PROFILES_PER_PAGE;
         $limit =  PROFILES_PER_PAGE + 1;
 
+        $cnt = 0;
+
         if ($this->tag) {
             $subscriptions = $this->user->getTaggedSubscriptions($this->tag, $offset, $limit);
         } else {
@@ -92,7 +94,7 @@ class SubscriptionsAction extends GalleryAction
 
         if ($subscriptions) {
             $subscriptions_list = new SubscriptionsList($subscriptions, $this->user, $this);
-            $subscriptions_list->show();
+            $cnt = $subscriptions_list->show();
         }
 
         $subscriptions->free();
diff --git a/actions/tag.php b/actions/tag.php
index 039cd9660..231f2c299 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -24,14 +24,22 @@ class TagAction extends Action
     function prepare($args)
     {
         parent::prepare($args);
-        $this->tag = $this->trimmed('tag');
+        $taginput = $this->trimmed('tag');
+        $this->tag = common_canonical_tag($taginput);
 
         if (!$this->tag) {
             common_redirect(common_local_url('publictagcloud'), 301);
             return false;
         }
 
+        if ($this->tag != $taginput) {
+            common_redirect(common_local_url('tag', array('tag' => $this->tag)));
+        }
+
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
@@ -53,12 +61,11 @@ class TagAction extends Action
         $this->showPage();
     }
 
-    function showFeeds()
+    function getFeeds()
     {
-        $this->element('link', array('rel' => 'alternate',
-                                     'href' => common_local_url('tagrss', array('tag' => $this->tag)),
-                                     'type' => 'application/rss+xml',
-                                     'title' => sprintf(_('Feed for tag %s'), $this->tag)));
+        return array(new Feed(Feed::RSS1,
+                              common_local_url('tagrss', array('tag' => $this->tag)),
+                              sprintf(_('Feed for tag %s'), $this->tag)));
     }
 
     function showPageNotice()
@@ -66,15 +73,6 @@ class TagAction extends Action
         return sprintf(_('Messages tagged "%s", most recent first'), $this->tag);
     }
 
-    function showExportData()
-    {
-        $fl = new FeedList($this);
-        $fl->show(array(0=>array('href'=>common_local_url('tagrss', array('tag' => $this->tag)),
-                                 'type' => 'rss',
-                                 'version' => 'RSS 1.0',
-                                 'item' => 'tagrss')));
-    }
-
     function showContent()
     {
         $notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
diff --git a/actions/tagother.php b/actions/tagother.php
index 9a63fc438..0d18945a0 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -80,7 +80,7 @@ class TagotherAction extends Action
         $this->elementStart('dl', 'entity_depiction');
         $this->element('dt', null, _('Photo'));
         $this->elementStart('dd');
-        $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
+        $this->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
                                     'class' => 'photo avatar',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
@@ -90,7 +90,6 @@ class TagotherAction extends Action
         $this->elementEnd('dd');
         $this->elementEnd('dl');
 
-
         $this->elementStart('dl', 'entity_nickname');
         $this->element('dt', null, _('Nickname'));
         $this->elementStart('dd');
@@ -111,7 +110,7 @@ class TagotherAction extends Action
         if ($this->profile->location) {
             $this->elementStart('dl', 'entity_location');
             $this->element('dt', null, _('Location'));
-            $this->element('dd', 'location', $this->profile->location);
+            $this->element('dd', 'label', $this->profile->location);
             $this->elementEnd('dl');
         }
         if ($this->profile->homepage) {
@@ -136,12 +135,15 @@ class TagotherAction extends Action
                                            'id' => 'form_tag_user',
                                            'class' => 'form_settings',
                                            'name' => 'tagother',
-                                           'action' => $this->selfUrl()));
+                                           'action' => common_local_url('tagother', array('id' => $this->profile->id))));
+
         $this->elementStart('fieldset');
         $this->element('legend', null, _('Tag user'));
         $this->hidden('token', common_session_token());
         $this->hidden('id', $this->profile->id);
 
+        $user = common_current_user();
+
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->input('tags', _('Tags'),
@@ -202,7 +204,7 @@ class TagotherAction extends Action
         $action = $user->isSubscribed($this->profile) ? 'subscriptions' : 'subscribers';
 
         if ($this->boolean('ajax')) {
-            $this->startHTML('text/xml');
+            $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             $this->element('title', null, _('Tags'));
             $this->elementEnd('head');
diff --git a/actions/tagrss.php b/actions/tagrss.php
index b4c2dcdff..a77fa12c9 100644
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -25,12 +25,12 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 class TagrssAction extends Rss10Action
 {
+    var $tag;
 
-    function init()
-    {
-        $tag = $this->trimmed('tag');
+    function prepare($args) {
+        parent::prepare($args);
+        $tag = common_canonical_tag($this->trimmed('tag'));
         $this->tag = Notice_tag::staticGet('tag', $tag);
-
         if (!$this->tag) {
             $this->clientError(_('No such tag.'));
             return false;
@@ -39,7 +39,7 @@ class TagrssAction extends Rss10Action
         }
     }
 
-    function get_notices($limit=0)
+    function getNotices($limit=0)
     {
         $tag = $this->tag;
 
@@ -48,7 +48,6 @@ class TagrssAction extends Rss10Action
         }
 
         $notice = Notice_tag::getStream($tag->tag, 0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
-
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
@@ -56,10 +55,9 @@ class TagrssAction extends Rss10Action
         return $notices;
     }
 
-    function get_channel()
+    function getChannel()
     {
-        $tag = $this->tag->tag;
-
+        $tagname = $this->tag->tag;
         $c = array('url' => common_local_url('tagrss', array('tag' => $tagname)),
                'title' => $tagname,
                'link' => common_local_url('tagrss', array('tag' => $tagname)),
diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index dc8e2e798..68a18cb57 100644
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -23,23 +23,24 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
 
 class TwitapiaccountAction extends TwitterapiAction
 {
-
-	function verify_credentials($args, $apidata)
+    function verify_credentials($args, $apidata)
     {
+        parent::handle($args);
 
-		if ($apidata['content-type'] == 'xml') {
-			header('Content-Type: application/xml; charset=utf-8');
-			print '<authorized>true</authorized>';
-		} elseif ($apidata['content-type'] == 'json') {
-			header('Content-Type: application/json; charset=utf-8');
-			print '{"authorized":true}';
-		} else {
-			common_user_error(_('API method not found!'), $code=404);
-		}
-
-	}
+        switch ($apidata['content-type']) {
+        case 'xml':
+        case 'json':
+            $action_obj = new TwitapiusersAction();
+            $action_obj->prepare($args);
+            call_user_func(array($action_obj, 'show'), $args, $apidata);
+            break;
+        default:
+            header('Content-Type: text/html; charset=utf-8');
+            print 'Authorized';
+        }
+    }
 
-    function end_session($args, $apidata)
+   function end_session($args, $apidata)
     {
         parent::handle($args);
         $this->serverError(_('API method under construction.'), $code=501);
@@ -56,7 +57,7 @@ class TwitapiaccountAction extends TwitterapiAction
 
         $location = trim($this->arg('location'));
 
-        if (!is_null($location) && strlen($location) > 255) {
+        if (!is_null($location) && mb_strlen($location) > 255) {
 
             // XXX: But Twitter just truncates and runs with it. -- Zach
             $this->clientError(_('That\'s too long. Max notice size is 255 chars.'), 406, $apidate['content-type']);
diff --git a/actions/twitapisearch.php b/actions/twitapisearch.php
new file mode 100644
index 000000000..822ee77e1
--- /dev/null
+++ b/actions/twitapisearch.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * List of replies
+ *
+ * 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  Search
+ * @package   Laconica
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) { 
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/twitterapi.php';
+
+/**
+ * Action handler for Twitter-compatible API search
+ *
+ * @category Search
+ * @package  Laconica
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ * @see      TwitterapiAction
+ */
+
+class TwitapisearchAction extends TwitterapiAction
+{
+    
+    var $query;
+    var $limit;
+    var $callback;
+    
+    /**
+     * Initialization.
+     *
+     * @param array $args Web and URL arguments
+     *
+     * @return boolean false if user doesn't exist
+     */
+     
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $qeury = $this->trimmed('query');
+
+        return true;
+    }
+    
+    /**
+     * Handle a request
+     *
+     * @param array $args Arguments from $_REQUEST
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showResults($this->limit);
+    }
+    
+    /**
+     * Show search results
+     *
+     * @param int $limit Number of notices to show
+     *
+     * @return void
+     */
+    
+    function showResults($limit) 
+    {
+        $this->serverError(_('API method under construction.'), $code = 501);        
+    }
+    
+}
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index a35f4b12e..216835026 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -204,7 +204,7 @@ class TwitapistatusesAction extends TwitterapiAction
         # FriendFeed's SUP protocol
         # Also added RSS and Atom feeds
 
-        $suplink = common_local_url('sup', null, $user->id);
+        $suplink = common_local_url('sup', null, null, $user->id);
         header('X-SUP-ID: '.$suplink);
 
         # XXX: since
@@ -450,7 +450,6 @@ class TwitapistatusesAction extends TwitterapiAction
         if ($user->id == $notice->profile_id) {
             $replies = new Reply;
             $replies->get('notice_id', $notice_id);
-            common_dequeue_notice($notice);
             $replies->delete();
             $notice->delete();
 
@@ -471,19 +470,28 @@ class TwitapistatusesAction extends TwitterapiAction
         return $this->subscriptions($apidata, 'subscribed', 'subscriber');
     }
 
-    function followers($args, $apidata)
+    function friendsIDs($args, $apidata)
     {
         parent::handle($args);
+        return $this->subscriptions($apidata, 'subscribed', 'subscriber', true);
+    }
 
+    function followers($args, $apidata)
+    {
+        parent::handle($args);
         return $this->subscriptions($apidata, 'subscriber', 'subscribed');
     }
 
-    function subscriptions($apidata, $other_attr, $user_attr)
+    function followersIDs($args, $apidata)
     {
+        parent::handle($args);
+        return $this->subscriptions($apidata, 'subscriber', 'subscribed', true);
+    }
 
-        # XXX: lite
+    function subscriptions($apidata, $other_attr, $user_attr, $onlyIDs=false)
+    {
 
-        $this->auth_user = $apidate['user'];
+        $this->auth_user = $apidata['user'];
         $user = $this->get_user($apidata['api_arg'], $apidata);
 
         if (!$user) {
@@ -515,7 +523,10 @@ class TwitapistatusesAction extends TwitterapiAction
         }
 
         $sub->orderBy('created DESC');
-        $sub->limit(($page-1)*100, 100);
+
+        if (!$onlyIDs) {
+            $sub->limit(($page-1)*100, 100);
+        }
 
         $others = array();
 
@@ -530,7 +541,13 @@ class TwitapistatusesAction extends TwitterapiAction
         $type = $apidata['content-type'];
 
         $this->init_document($type);
-        $this->show_profiles($others, $type);
+
+        if ($onlyIDs) {
+            $this->showIDs($others, $type);
+        } else {
+            $this->show_profiles($others, $type);
+        }
+
         $this->end_document($type);
     }
 
@@ -556,6 +573,28 @@ class TwitapistatusesAction extends TwitterapiAction
         }
     }
 
+    function showIDs($profiles, $type)
+    {
+        switch ($type) {
+         case 'xml':
+            $this->elementStart('ids');
+            foreach ($profiles as $profile) {
+                $this->element('id', null, $profile->id);
+            }
+            $this->elementEnd('ids');
+            break;
+         case 'json':
+            $ids = array();
+            foreach ($profiles as $profile) {
+                $ids[] = (int)$profile->id;
+            }
+            print json_encode($ids);
+            break;
+         default:
+            $this->clientError(_('unsupported file type'));
+        }
+    }
+
     function featured($args, $apidata)
     {
         parent::handle($args);
diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php
new file mode 100644
index 000000000..c73d89446
--- /dev/null
+++ b/actions/twitapitrends.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * List of replies
+ *
+ * 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  Search
+ * @package   Laconica
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/twitterapi.php';
+
+/**
+ *  Returns the top ten queries that are currently trending
+ *
+ * @category Search
+ * @package  Laconica
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      TwitterapiAction
+ */
+
+class TwitapitrendsAction extends TwitterapiAction
+{
+
+    var $callback;
+
+    /**
+     * Initialization.
+     *
+     * @param array $args Web and URL arguments
+     *
+     * @return boolean false if user doesn't exist
+     */
+    function prepare($args)
+    {
+        parent::prepare($args);
+        return true;
+    }
+
+    /**
+     * Handle a request
+     *
+     * @param array $args Arguments from $_REQUEST
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showTrends();
+    }
+
+    /**
+     * Output the trends
+     *
+     * @return void
+     */
+    function showTrends()
+    {
+        $this->serverError(_('API method under construction.'), $code = 501);
+    }
+
+}
\ No newline at end of file
diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 8f16e5613..2894b7486 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -25,25 +25,29 @@ class TwitapiusersAction extends TwitterapiAction
 {
 
     function show($args, $apidata)
-    {
+    {        
         parent::handle($args);
 
-        if (!in_array($apidata['content-type'], array('xml', 'json'))) {
+        if (!in_array($apidata['content-type'], array('xml', 'json'))) {            
             $this->clientError(_('API method not found!'), $code = 404);
             return;
         }
-
- $this->auth_user = $apidata['user'];
+                
 		$user = null;
 		$email = $this->arg('email');
+		$user_id = $this->arg('user_id');
 
 		if ($email) {
 			$user = User::staticGet('email', $email);
+		} elseif ($user_id) {
+		 	$user = $this->get_user($user_id);  
 		} elseif (isset($apidata['api_arg'])) {
 			$user = $this->get_user($apidata['api_arg']);
-		}
-
-		if (!$user) {
+	    } elseif (isset($apidata['user'])) {
+	        $user = $apidata['user'];
+	    }
+	
+		if (!$user) {		    
 			// XXX: Twitter returns a random(?) user instead of throwing and err! -- Zach
 			$this->client_error(_('Not found.'), 404, $apidata['content-type']);
 			return;
@@ -74,9 +78,12 @@ class TwitapiusersAction extends TwitterapiAction
 
 		// Other fields Twitter sends...
 		$twitter_user['profile_background_color'] = '';
+		$twitter_user['profile_background_image_url'] = '';
 		$twitter_user['profile_text_color'] = '';
 		$twitter_user['profile_link_color'] = '';
 		$twitter_user['profile_sidebar_fill_color'] = '';
+        $twitter_user['profile_sidebar_border_color'] = '';
+        $twitter_user['profile_background_tile'] = 'false';
 
 		$faves = DB_DataObject::factory('fave');
 		$faves->user_id = $user->id;
@@ -94,18 +101,27 @@ class TwitapiusersAction extends TwitterapiAction
 		$twitter_user['utc_offset'] = $t->format('Z');
 		$twitter_user['time_zone'] = $timezone;
 
-		if (isset($this->auth_user)) {
+		if (isset($apidata['user'])) {
 
-			if ($this->auth_user->isSubscribed($profile)) {
+			if ($apidata['user']->isSubscribed($profile)) {
 				$twitter_user['following'] = 'true';
 			} else {
 				$twitter_user['following'] = 'false';
 			}
-
-			// Not implemented yet
-			$twitter_user['notifications'] = 'false';
-		}
-
+            
+            // Notifications on?
+		    $sub = Subscription::pkeyGet(array('subscriber' =>
+		        $apidata['user']->id, 'subscribed' => $profile->id));
+            
+            if ($sub) {
+                if ($sub->jabber || $sub->sms) {
+                    $twitter_user['notifications'] = 'true';
+                } else {
+                    $twitter_user['notifications'] = 'false';
+                }
+            }
+        }
+        
 		if ($apidata['content-type'] == 'xml') {
 			$this->init_document('xml');
 			$this->show_twitter_xml_user($twitter_user);
@@ -114,7 +130,13 @@ class TwitapiusersAction extends TwitterapiAction
 			$this->init_document('json');
 			$this->show_json_objects($twitter_user);
 			$this->end_document('json');
-		}
+		} else {
+		    
+		    // This is in case 'show' was called via /account/verify_credentials
+		    // without a format (xml or json).
+            header('Content-Type: text/html; charset=utf-8');
+            print 'Authorized';
+        }
 
 	}
 }
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index bb0bc5946..a79859bbf 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -32,6 +32,7 @@ if (!defined('LACONICA')) {
 }
 
 require_once INSTALLDIR.'/lib/connectsettingsaction.php';
+require_once INSTALLDIR.'/lib/twitter.php';
 
 define('SUBSCRIPTIONS', 80);
 
@@ -57,7 +58,7 @@ class TwittersettingsAction extends ConnectSettingsAction
 
     function title()
     {
-        _('Twitter settings');
+        return _('Twitter settings');
     }
 
     /**
@@ -90,7 +91,7 @@ class TwittersettingsAction extends ConnectSettingsAction
 
         $fuser = null;
 
-        $flink = Foreign_link::getByUserID($user->id, 1); // 1 == Twitter
+        $flink = Foreign_link::getByUserID($user->id, TWITTER_SERVICE);
 
         if ($flink) {
             $fuser = $flink->getForeignUser();
@@ -109,7 +110,7 @@ class TwittersettingsAction extends ConnectSettingsAction
             $this->elementStart('li', array('id' => 'settings_twitter_remove'));
             $this->element('span', 'twitter_user', $fuser->nickname);
             $this->element('a', array('href' => $fuser->uri), $fuser->uri);
-            $this->element('p', 'form_guide',
+            $this->element('p', 'form_note',
                            _('Current verified Twitter account.'));
             $this->hidden('flink_foreign_id', $flink->foreign_id);
             $this->elementEnd('li');
@@ -250,8 +251,8 @@ class TwittersettingsAction extends ConnectSettingsAction
                 $avatar = $other->getAvatar(AVATAR_MINI_SIZE);
 
                 $avatar_url = ($avatar) ?
-                  common_avatar_display_url($avatar) :
-                  common_default_avatar(AVATAR_MINI_SIZE);
+                  $avatar->displayUrl() :
+                  Avatar::defaultImage(AVATAR_MINI_SIZE);
 
                 $this->element('img', array('src' => $avatar_url,
                                             'width' => AVATAR_MINI_SIZE,
@@ -358,7 +359,7 @@ class TwittersettingsAction extends ConnectSettingsAction
 
         $flink->user_id     = $user->id;
         $flink->foreign_id  = $twit_user->id;
-        $flink->service     = 1; // Twitter
+        $flink->service     = TWITTER_SERVICE;
         $flink->credentials = $password;
         $flink->created     = common_sql_now();
 
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index f9dd6f821..b1e2b6425 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -66,7 +66,7 @@ class UnsubscribeAction extends Action
         }
 
         if ($this->boolean('ajax')) {
-            $this->startHTML('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             $this->element('title', null, _('Unsubscribed'));
             $this->elementEnd('head');
diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index c79112dac..4751a04ff 100644
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -93,22 +93,22 @@ class UpdateprofileAction extends Action
         }
         # optional stuff
         $fullname = $req->get_parameter('omb_listenee_fullname');
-        if ($fullname && strlen($fullname) > 255) {
+        if ($fullname && mb_strlen($fullname) > 255) {
             $this->clientError(_("Full name is too long (max 255 chars)."));
             return false;
         }
         $homepage = $req->get_parameter('omb_listenee_homepage');
-        if ($homepage && (!common_valid_http_url($homepage) || strlen($homepage) > 255)) {
+        if ($homepage && (!common_valid_http_url($homepage) || mb_strlen($homepage) > 255)) {
             $this->clientError(sprintf(_("Invalid homepage '%s'"), $homepage));
             return false;
         }
         $bio = $req->get_parameter('omb_listenee_bio');
-        if ($bio && strlen($bio) > 140) {
+        if ($bio && mb_strlen($bio) > 140) {
             $this->clientError(_("Bio is too long (max 140 chars)."));
             return false;
         }
         $location = $req->get_parameter('omb_listenee_location');
-        if ($location && strlen($location) > 255) {
+        if ($location && mb_strlen($location) > 255) {
             $this->clientError(_("Location is too long (max 255 chars)."));
             return false;
         }
@@ -162,7 +162,13 @@ class UpdateprofileAction extends Action
             if ($avatar) {
                 $temp_filename = tempnam(sys_get_temp_dir(), 'listenee_avatar');
                 copy($avatar, $temp_filename);
-                if (!$profile->setOriginal($temp_filename)) {
+                $imagefile = new ImageFile($profile->id, $temp_filename);
+                $filename = Avatar::filename($profile->id,
+                                     image_type_to_extension($imagefile->type),
+                                     null,
+                                     common_timestamp());
+                rename($temp_filename, Avatar::path($filename));
+                if (!$profile->setOriginal($filename)) {
                     $this->serverError(_('Could not save avatar info'), 500);
                     return false;
                 }
diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index ed62f640c..0dc1841d4 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -86,7 +86,7 @@ class UserauthorizationAction extends Action
         $this->element('p', null, _('Please check these details to make sure '.
                                     'that you want to subscribe to this user\'s notices. '.
                                     'If you didn\'t just ask to subscribe to someone\'s notices, '.
-                                    'click "Cancel".'));
+                                    'click "Reject".'));
     }
 
     function showContent()
@@ -105,7 +105,7 @@ class UserauthorizationAction extends Action
         $this->elementStart('div', 'profile');
         if ($avatar) {
             $this->element('img', array('src' => $avatar,
-                                        'class' => 'avatar profile',
+                                        'class' => 'avatar',
                                         'width' => AVATAR_PROFILE_SIZE,
                                         'height' => AVATAR_PROFILE_SIZE,
                                         'alt' => $nickname));
@@ -330,7 +330,13 @@ class UserauthorizationAction extends Action
     {
         $temp_filename = tempnam(sys_get_temp_dir(), 'listenee_avatar');
         copy($url, $temp_filename);
-        return $profile->setOriginal($temp_filename);
+        $imagefile = new ImageFile($profile->id, $temp_filename);
+        $filename = Avatar::filename($profile->id,
+                                     image_type_to_extension($imagefile->type),
+                                     null,
+                                     common_timestamp());
+        rename($temp_filename, Avatar::path($filename));
+        return $profile->setOriginal($filename);
     }
 
     function showAcceptMessage($tok)
@@ -469,19 +475,19 @@ class UserauthorizationAction extends Action
         }
         # optional stuff
         $fullname = $req->get_parameter('omb_listenee_fullname');
-        if ($fullname && strlen($fullname) > 255) {
+        if ($fullname && mb_strlen($fullname) > 255) {
             throw new OAuthException("Full name '$fullname' too long.");
         }
         $homepage = $req->get_parameter('omb_listenee_homepage');
-        if ($homepage && (!common_valid_http_url($homepage) || strlen($homepage) > 255)) {
+        if ($homepage && (!common_valid_http_url($homepage) || mb_strlen($homepage) > 255)) {
             throw new OAuthException("Invalid homepage '$homepage'");
         }
         $bio = $req->get_parameter('omb_listenee_bio');
-        if ($bio && strlen($bio) > 140) {
+        if ($bio && mb_strlen($bio) > 140) {
             throw new OAuthException("Bio too long '$bio'");
         }
         $location = $req->get_parameter('omb_listenee_location');
-        if ($location && strlen($location) > 255) {
+        if ($location && mb_strlen($location) > 255) {
             throw new OAuthException("Location too long '$location'");
         }
         $avatar = $req->get_parameter('omb_listenee_avatar');
diff --git a/actions/usergroups.php b/actions/usergroups.php
index 58cf7eeb6..ded4ba76b 100644
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -125,6 +125,12 @@ class UsergroupsAction extends Action
                        _('Create a new group'));
         $this->elementEnd('p');
 
+        $this->elementStart('p', array('id' => 'group_search'));
+        $this->element('a', array('href' => common_local_url('groupsearch'),
+                                  'class' => 'more'),
+                       _('Search for more groups'));
+        $this->elementEnd('p');
+
         $offset = ($this->page-1) * GROUPS_PER_PAGE;
         $limit =  GROUPS_PER_PAGE + 1;
 
diff --git a/actions/userrss.php b/actions/userrss.php
index 04855ccca..a3e5a3aab 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -46,13 +46,13 @@ class UserrssAction extends Rss10Action
     {
 
         $user = $this->user;
-        
+
         if (is_null($user)) {
             return null;
         }
-        
+
         $notice = $user->getNotices(0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
-        
+
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
@@ -87,10 +87,10 @@ class UserrssAction extends Rss10Action
     }
 
     # override parent to add X-SUP-ID URL
-    
+
     function initRss($limit=0)
     {
-        $url = common_local_url('sup', null, $this->user->id);
+        $url = common_local_url('sup', null, null, $this->user->id);
         header('X-SUP-ID: '.$url);
         parent::initRss($limit);
     }
@@ -100,4 +100,3 @@ class UserrssAction extends Rss10Action
         return true;
     }
 }
-
diff --git a/bin/flowplayer-3.0.5.swf b/bin/flowplayer-3.0.5.swf
new file mode 100644
index 000000000..05b64a032
--- /dev/null
+++ b/bin/flowplayer-3.0.5.swf
diff --git a/bin/flowplayer.audio-3.0.3.swf b/bin/flowplayer.audio-3.0.3.swf
new file mode 100644
index 000000000..ef85f1bff
--- /dev/null
+++ b/bin/flowplayer.audio-3.0.3.swf
diff --git a/bin/flowplayer.controls-3.0.3.swf b/bin/flowplayer.controls-3.0.3.swf
new file mode 100644
index 000000000..09a27e8a9
--- /dev/null
+++ b/bin/flowplayer.controls-3.0.3.swf
diff --git a/classes/Avatar.php b/classes/Avatar.php
index 9ae920647..db9d78e47 100644
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -4,18 +4,18 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Avatar extends Memcached_DataObject 
+class Avatar extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'avatar';                          // table name
     public $profile_id;                      // int(4)  primary_key not_null
-    public $original;                        // tinyint(1)  
+    public $original;                        // tinyint(1)
     public $width;                           // int(4)  primary_key not_null
     public $height;                          // int(4)  primary_key not_null
     public $mediatype;                       // varchar(32)   not_null
-    public $filename;                        // varchar(255)  
+    public $filename;                        // varchar(255)
     public $url;                             // varchar(255)  unique_key
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
@@ -33,109 +33,51 @@ class Avatar extends Memcached_DataObject
     {
         $filename = $this->filename;
         if (parent::delete()) {
-            @unlink(common_avatar_path($filename));
+            @unlink(Avatar::path($filename));
         }
     }
 
-    # Create and save scaled version of this avatar
-    # XXX: maybe break into different methods
-
-    function scale($size)
+    function &pkeyGet($kv)
     {
+        return Memcached_DataObject::pkeyGet('Avatar', $kv);
+    }
 
-        $image_s = imagecreatetruecolor($size, $size);
-        $image_a = $this->to_image();
-        $square = min($this->width, $this->height);
-        imagecolortransparent($image_s, imagecolorallocate($image_s, 0, 0, 0));
-        imagealphablending($image_s, false);
-        imagesavealpha($image_s, true);
-        imagecopyresampled($image_s, $image_a, 0, 0, 0, 0,
-                           $size, $size, $square, $square);
-
-        $ext = ($this->mediattype == 'image/jpeg') ? ".jpeg" : ".png";
-
-        $filename = common_avatar_filename($this->profile_id, $ext, $size, common_timestamp());
-
-        if ($this->mediatype == 'image/jpeg') {
-            imagejpeg($image_s, common_avatar_path($filename));
-        } else {
-            imagepng($image_s, common_avatar_path($filename));
-        }
-
-        $scaled = DB_DataObject::factory('avatar');
-        $scaled->profile_id = $this->profile_id;
-        $scaled->width = $size;
-        $scaled->height = $size;
-        $scaled->original = false;
-        $scaled->mediatype = ($this->mediattype == 'image/jpeg') ? 'image/jpeg' : 'image/png';
-        $scaled->filename = $filename;
-        $scaled->url = common_avatar_url($filename);
-        $scaled->created = DB_DataObject_Cast::dateTime(); # current time
+    // where should the avatar go for this user?
 
-        if ($scaled->insert()) {
-            return $scaled;
+    static function filename($id, $extension, $size=null, $extra=null)
+    {
+        if ($size) {
+            return $id . '-' . $size . (($extra) ? ('-' . $extra) : '') . $extension;
         } else {
-            return null;
+            return $id . '-original' . (($extra) ? ('-' . $extra) : '') . $extension;
         }
     }
 
-    function scale_and_crop($size, $x, $y, $w, $h) 
+    static function path($filename)
     {
+        return INSTALLDIR . '/avatar/' . $filename;
+    }
 
-        $image_s = imagecreatetruecolor($size, $size);
-        $image_a = $this->to_image();
-
-        # Retain alpha channel info if possible for .pngs
-        $background = imagecolorallocate($image_s, 0, 0, 0);
-        ImageColorTransparent($image_s, $background);
-        imagealphablending($image_s, false);
-
-        imagecopyresized($image_s, $image_a, 0, 0, $x, $y, $size, $size, $w, $h);
-
-        $ext = ($this->mediattype == 'image/jpeg') ? ".jpeg" : ".png";
-
-        $filename = common_avatar_filename($this->profile_id, $ext, $size, common_timestamp());
-
-        if ($this->mediatype == 'image/jpeg') {
-            imagejpeg($image_s, common_avatar_path($filename));
-        } else {
-            imagepng($image_s, common_avatar_path($filename));
-        }
-
-        $cropped = DB_DataObject::factory('avatar');
-        $cropped->profile_id = $this->profile_id;
-        $cropped->width = $size;
-        $cropped->height = $size;
-        $cropped->original = false;
-        $cropped->mediatype = ($this->mediattype == 'image/jpeg') ? 'image/jpeg' : 'image/png';
-        $cropped->filename = $filename;
-        $cropped->url = common_avatar_url($filename);
-        $cropped->created = DB_DataObject_Cast::dateTime(); # current time
-
-        if ($cropped->insert()) {
-            return $cropped;
-        } else {
-            return NULL;
-        }
+    static function url($filename)
+    {
+        return common_path('avatar/'.$filename);
     }
 
-    function to_image() 
+    function displayUrl()
     {
-        $filepath = common_avatar_path($this->filename);
-        if ($this->mediatype == 'image/gif') {
-            return imagecreatefromgif($filepath);
-        } else if ($this->mediatype == 'image/jpeg') {
-            return imagecreatefromjpeg($filepath);
-        } else if ($this->mediatype == 'image/png') {
-            return imagecreatefrompng($filepath);
+        $server = common_config('avatar', 'server');
+        if ($server) {
+            return 'http://'.$server.'/'.$this->filename;
         } else {
-            return NULL;
+            return $this->url;
         }
     }
-    
-    function &pkeyGet($kv) 
+
+    static function defaultImage($size)
     {
-        return Memcached_DataObject::pkeyGet('Avatar', $kv);
+        static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile',
+                                  AVATAR_STREAM_SIZE => 'stream',
+                                  AVATAR_MINI_SIZE => 'mini');
+        return theme_path('default-avatar-'.$sizenames[$size].'.png');
     }
-
 }
diff --git a/classes/Notice.php b/classes/Notice.php
index 4a06c9258..907239b08 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -34,22 +34,23 @@ class Notice extends Memcached_DataObject
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
-    public $__table = 'notice';                             // table name
-    public $id;                                 // int(4)    primary_key not_null
-    public $profile_id;                         // int(4)     not_null
+    public $__table = 'notice';                          // table name
+    public $id;                              // int(4)  primary_key not_null
+    public $profile_id;                      // int(4)   not_null
     public $uri;                             // varchar(255)  unique_key
     public $content;                         // varchar(140)
-    public $rendered;                         // text()
+    public $rendered;                        // text()
     public $url;                             // varchar(255)
-    public $created;                         // datetime()     not_null
-    public $modified;                         // timestamp()      not_null default_CURRENT_TIMESTAMP
-    public $reply_to;                         // int(4)
-    public $is_local;                         // tinyint(1)
-    public $source;                             // varchar(32)
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
+    public $reply_to;                        // int(4)
+    public $is_local;                        // tinyint(1)
+    public $source;                          // varchar(32)
 
     /* 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
@@ -63,8 +64,24 @@ class Notice extends Memcached_DataObject
     {
         $this->blowCaches(true);
         $this->blowFavesCache(true);
-        $this->blowInboxes();
-        return parent::delete();
+        $this->blowSubsCache(true);
+
+        $this->query('BEGIN');
+        $related = array('Reply',
+                         'Fave',
+                         'Notice_tag',
+                         'Group_inbox',
+                         'Queue_item');
+        if (common_config('inboxes', 'enabled')) {
+            $related[] = 'Notice_inbox';
+        }
+        foreach ($related as $cls) {
+            $inst = new $cls();
+            $inst->notice_id = $this->id;
+            $inst->delete();
+        }
+        $result = parent::delete();
+        $this->query('COMMIT');
     }
 
     function saveTags()
@@ -75,26 +92,31 @@ class Notice extends Memcached_DataObject
             return true;
         }
 
-        /* elide characters we don't want in the tag */
-        $match[1] = str_replace(array('-', '_', '.'), '', $match[1]);
-
         /* Add them to the database */
         foreach(array_unique($match[1]) as $hashtag) {
-            $tag = DB_DataObject::factory('Notice_tag');
-            $tag->notice_id = $this->id;
-            $tag->tag = $hashtag;
-            $tag->created = $this->created;
-            $id = $tag->insert();
-            if (!$id) {
-                $last_error = PEAR::getStaticProperty('DB_DataObject','lastError');
-                common_log(LOG_ERR, 'DB error inserting hashtag: ' . $last_error->message);
-                common_server_error(sprintf(_('DB error inserting hashtag: %s'), $last_error->message));
-                return;
-            }
+            /* elide characters we don't want in the tag */
+            $this->saveTag($hashtag);
         }
         return true;
     }
 
+    function saveTag($hashtag)
+    {
+        $hashtag = common_canonical_tag($hashtag);
+
+        $tag = new Notice_tag();
+        $tag->notice_id = $this->id;
+        $tag->tag = $hashtag;
+        $tag->created = $this->created;
+        $id = $tag->insert();
+
+        if (!$id) {
+            throw new ServerException(sprintf(_('DB error inserting hashtag: %s'),
+                                              $last_error->message));
+            return;
+        }
+    }
+
     static function saveNew($profile_id, $content, $source=null, $is_local=1, $reply_to=null, $uri=null) {
 
         $profile = Profile::staticGet($profile_id);
@@ -120,10 +142,12 @@ class Notice extends Memcached_DataObject
         $notice->profile_id = $profile_id;
 
         $blacklist = common_config('public', 'blacklist');
+        $autosource = common_config('public', 'autosource');
 
         # Blacklisted are non-false, but not 1, either
 
-        if ($blacklist && in_array($profile_id, $blacklist)) {
+        if (($blacklist && in_array($profile_id, $blacklist)) ||
+            ($source && $autosource && in_array($source, $autosource))) {
             $notice->is_local = -1;
         } else {
             $notice->is_local = $is_local;
@@ -138,32 +162,37 @@ class Notice extends Memcached_DataObject
         $notice->source = $source;
         $notice->uri = $uri;
 
-        $id = $notice->insert();
-
-        if (!$id) {
-            common_log_db_error($notice, 'INSERT', __FILE__);
-            return _('Problem saving notice.');
-        }
+        if (Event::handle('StartNoticeSave', array(&$notice))) {
 
-        # Update the URI after the notice is in the database
-        if (!$uri) {
-            $orig = clone($notice);
-            $notice->uri = common_notice_uri($notice);
+            $id = $notice->insert();
 
-            if (!$notice->update($orig)) {
-                common_log_db_error($notice, 'UPDATE', __FILE__);
+            if (!$id) {
+                common_log_db_error($notice, 'INSERT', __FILE__);
                 return _('Problem saving notice.');
             }
-        }
 
-        # XXX: do we need to change this for remote users?
+            # Update the URI after the notice is in the database
+            if (!$uri) {
+                $orig = clone($notice);
+                $notice->uri = common_notice_uri($notice);
+
+                if (!$notice->update($orig)) {
+                    common_log_db_error($notice, 'UPDATE', __FILE__);
+                    return _('Problem saving notice.');
+                }
+            }
+
+            # XXX: do we need to change this for remote users?
 
-        $notice->saveReplies();
-        $notice->saveTags();
-        $notice->saveGroups();
+            $notice->saveReplies();
+            $notice->saveTags();
+            $notice->saveGroups();
 
-        $notice->addToInboxes();
-		$notice->query('COMMIT');
+            $notice->addToInboxes();
+            $notice->query('COMMIT');
+
+            Event::handle('EndNoticeSave', array($notice));
+        }
 
         # Clear the cache for subscribed users, so they'll update at next request
         # XXX: someone clever could prepend instead of clearing the cache
@@ -257,8 +286,10 @@ class Notice extends Memcached_DataObject
         if ($cache) {
             $user = new User();
 
+            $UT = common_config('db','type')=='pgsql'?'"user"':'user';
             $user->query('SELECT id ' .
-                         'FROM user JOIN subscription ON user.id = subscription.subscriber ' .
+
+                         "FROM $UT JOIN subscription ON $UT.id = subscription.subscriber " .
                          'WHERE subscription.subscribed = ' . $this->profile_id);
 
             while ($user->fetch()) {
@@ -552,38 +583,23 @@ class Notice extends Memcached_DataObject
 
         if ($enabled === true || $enabled === 'transitional') {
             $inbox = new Notice_inbox();
+            $UT = common_config('db','type')=='pgsql'?'"user"':'user';
             $qry = 'INSERT INTO notice_inbox (user_id, notice_id, created) ' .
-              'SELECT user.id, ' . $this->id . ', "' . $this->created . '" ' .
-              'FROM user JOIN subscription ON user.id = subscription.subscriber ' .
+              "SELECT $UT.id, " . $this->id . ", '" . $this->created . "' " .
+              "FROM $UT JOIN subscription ON $UT.id = subscription.subscriber " .
               'WHERE subscription.subscribed = ' . $this->profile_id . ' ' .
               'AND NOT EXISTS (SELECT user_id, notice_id ' .
               'FROM notice_inbox ' .
-              'WHERE user_id = user.id ' .
+              "WHERE user_id = $UT.id " .
               'AND notice_id = ' . $this->id . ' )';
             if ($enabled === 'transitional') {
-                $qry .= ' AND user.inboxed = 1';
+                $qry .= " AND $UT.inboxed = 1";
             }
             $inbox->query($qry);
         }
         return;
     }
 
-    # Delete from inboxes if we're deleted.
-
-    function blowInboxes()
-    {
-
-        $enabled = common_config('inboxes', 'enabled');
-
-        if ($enabled === true || $enabled === 'transitional') {
-            $inbox = new Notice_inbox();
-            $inbox->notice_id = $this->id;
-            $inbox->delete();
-        }
-
-        return;
-    }
-
     function saveGroups()
     {
         $enabled = common_config('inboxes', 'enabled');
@@ -611,6 +627,15 @@ class Notice extends Memcached_DataObject
                 continue;
             }
 
+            // we automatically add a tag for every group name, too
+
+            $tag = Notice_tag::pkeyGet(array('tag' => common_canonical_tag($nickname),
+                                           'notice_id' => $this->id));
+
+            if (is_null($tag)) {
+                $this->saveTag($nickname);
+            }
+
             if ($profile->isMember($group)) {
 
                 $gi = new Group_inbox();
@@ -628,16 +653,17 @@ class Notice extends Memcached_DataObject
                 // FIXME: do this in an offline daemon
 
                 $inbox = new Notice_inbox();
+                $UT = common_config('db','type')=='pgsql'?'"user"':'user';
                 $qry = 'INSERT INTO notice_inbox (user_id, notice_id, created, source) ' .
-                  'SELECT user.id, ' . $this->id . ', "' . $this->created . '", 2 ' .
-                  'FROM user JOIN group_member ON user.id = group_member.profile_id ' .
+                  "SELECT $UT.id, " . $this->id . ", '" . $this->created . "', 2 " .
+                  "FROM $UT JOIN group_member ON $UT.id = group_member.profile_id " .
                   'WHERE group_member.group_id = ' . $group->id . ' ' .
                   'AND NOT EXISTS (SELECT user_id, notice_id ' .
                   'FROM notice_inbox ' .
-                  'WHERE user_id = user.id ' .
+                  "WHERE user_id = $UT.id " .
                   'AND notice_id = ' . $this->id . ' )';
                 if ($enabled === 'transitional') {
-                    $qry .= ' AND user.inboxed = 1';
+                    $qry .= " AND $UT.inboxed = 1";
                 }
                 $result = $inbox->query($qry);
             }
@@ -721,10 +747,19 @@ class Notice extends Memcached_DataObject
                         if (!$id) {
                             common_log_db_error($reply, 'INSERT', __FILE__);
                             return;
+                        } else {
+                            $replied[$recipient->id] = 1;
                         }
                     }
                 }
             }
         }
+
+        foreach (array_keys($replied) as $recipient) {
+            $user = User::staticGet('id', $recipient);
+            if ($user) {
+                mail_notify_attn($user, $this);
+            }
+        }
     }
 }
diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index 94f9296d6..f2247299a 100644
--- a/classes/Notice_tag.php
+++ b/classes/Notice_tag.php
@@ -19,7 +19,7 @@
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Notice_tag extends Memcached_DataObject 
+class Notice_tag extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -35,18 +35,18 @@ class Notice_tag extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
-    
+
     static function getStream($tag, $offset=0, $limit=20) {
-        $qry = 
+        $qry =
           'SELECT notice.* ' .
           'FROM notice JOIN notice_tag ON notice.id = notice_tag.notice_id ' .
-          'WHERE notice_tag.tag = "%s" ';
+          "WHERE notice_tag.tag = '%s' ";
 
         return Notice::getStream(sprintf($qry, $tag),
                                  'notice_tag:notice_stream:' . common_keyize($tag),
                                  $offset, $limit);
     }
-    
+
     function blowCache()
     {
         $cache = common_memcache();
@@ -54,4 +54,9 @@ class Notice_tag extends Memcached_DataObject
             $cache->delete(common_cache_key('notice_tag:notice_stream:' . $this->tag));
         }
     }
+
+    function &pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('Notice_tag', $kv);
+    }
 }
diff --git a/classes/Profile.php b/classes/Profile.php
index ab5a48e57..f3bfe299c 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -69,74 +69,51 @@ class Profile extends Memcached_DataObject
         }
     }
 
-    function setOriginal($source)
+    function setOriginal($filename)
     {
-
-        $info = @getimagesize($source);
-
-        if (!$info) {
-            return null;
-        }
-
-        $filename = common_avatar_filename($this->id,
-                                           image_type_to_extension($info[2]),
-                                           null, common_timestamp());
-        $filepath = common_avatar_path($filename);
-
-        copy($source, $filepath);
+        $imagefile = new ImageFile($this->id, Avatar::path($filename));
 
         $avatar = new Avatar();
-
         $avatar->profile_id = $this->id;
-        $avatar->width = $info[0];
-        $avatar->height = $info[1];
-        $avatar->mediatype = image_type_to_mime_type($info[2]);
+        $avatar->width = $imagefile->width;
+        $avatar->height = $imagefile->height;
+        $avatar->mediatype = image_type_to_mime_type($imagefile->type);
         $avatar->filename = $filename;
         $avatar->original = true;
-        $avatar->url = common_avatar_url($filename);
+        $avatar->url = Avatar::url($filename);
         $avatar->created = DB_DataObject_Cast::dateTime(); # current time
 
         # XXX: start a transaction here
 
-        if (!$this->delete_avatars()) {
-            @unlink($filepath);
-            return null;
-        }
-
-        if (!$avatar->insert()) {
-            @unlink($filepath);
+        if (!$this->delete_avatars() || !$avatar->insert()) {
+            @unlink(Avatar::path($filename));
             return null;
         }
 
         foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
             # We don't do a scaled one if original is our scaled size
             if (!($avatar->width == $size && $avatar->height == $size)) {
-                $s = $avatar->scale($size);
-                if (!$s) {
-                    return null;
-                }
-            }
-        }
 
-        return $avatar;
-    }
-
-    function crop_avatars($x, $y, $w, $h)
-    {
+                $scaled_filename = $imagefile->resize($size);
 
-        $avatar = $this->getOriginalAvatar();
-        $this->delete_avatars(false); # don't delete original
+                //$scaled = DB_DataObject::factory('avatar');
+                $scaled = new Avatar();
+                $scaled->profile_id = $this->id;
+                $scaled->width = $size;
+                $scaled->height = $size;
+                $scaled->original = false;
+                $scaled->mediatype = image_type_to_mime_type($imagefile->type);
+                $scaled->filename = $scaled_filename;
+                $scaled->url = Avatar::url($scaled_filename);
+                $scaled->created = DB_DataObject_Cast::dateTime(); # current time
 
-        foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
-            # We don't do a scaled one if original is our scaled size
-            if (!($avatar->width == $size && $avatar->height == $size)) {
-                $s = $avatar->scale_and_crop($size, $x, $y, $w, $h);
-                if (!$s) {
-                    return NULL;
+                if (!$scaled->insert()) {
+                    return null;
                 }
             }
         }
-        return true;
+
+        return $avatar;
     }
 
     function delete_avatars($original=true)
@@ -217,4 +194,13 @@ class Profile extends Memcached_DataObject
         }
     }
 
+    function avatarUrl($size=AVATAR_PROFILE_SIZE)
+    {
+        $avatar = $this->getAvatar($size);
+        if ($avatar) {
+            return $avatar->displayUrl();
+        } else {
+            return Avatar::defaultImage($size);
+        }
+    }
 }
diff --git a/classes/Profile_tag.php b/classes/Profile_tag.php
index cb60cbaec..0a1ad9cd6 100644
--- a/classes/Profile_tag.php
+++ b/classes/Profile_tag.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Profile_tag extends Memcached_DataObject 
+class Profile_tag extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -23,45 +23,46 @@ class Profile_tag extends Memcached_DataObject
     ###END_AUTOCODE
 
     static function getTags($tagger, $tagged) {
-        
+
         $tags = array();
 
         # XXX: store this in memcached
-        
+
         $profile_tag = new Profile_tag();
         $profile_tag->tagger = $tagger;
         $profile_tag->tagged = $tagged;
-        
+
         $profile_tag->find();
-        
+
         while ($profile_tag->fetch()) {
             $tags[] = $profile_tag->tag;
         }
-        
+
         $profile_tag->free();
-        
+
         return $tags;
     }
-    
+
     static function setTags($tagger, $tagged, $newtags) {
-        
+
+        $newtags = array_unique($newtags);
         $oldtags = Profile_tag::getTags($tagger, $tagged);
-        
+
         # Delete stuff that's old that not in new
-        
+
         $to_delete = array_diff($oldtags, $newtags);
-        
+
         # Insert stuff that's in new and not in old
-        
+
         $to_insert = array_diff($newtags, $oldtags);
-        
+
         $profile_tag = new Profile_tag();
-        
+
         $profile_tag->tagger = $tagger;
         $profile_tag->tagged = $tagged;
-        
+
         $profile_tag->query('BEGIN');
-        
+
         foreach ($to_delete as $deltag) {
             $profile_tag->tag = $deltag;
             $result = $profile_tag->delete();
@@ -70,7 +71,7 @@ class Profile_tag extends Memcached_DataObject
                 return false;
             }
         }
-        
+
         foreach ($to_insert as $instag) {
             $profile_tag->tag = $instag;
             $result = $profile_tag->insert();
@@ -79,12 +80,12 @@ class Profile_tag extends Memcached_DataObject
                 return false;
             }
         }
-        
+
         $profile_tag->query('COMMIT');
-        
+
         return true;
     }
-    
+
     # Return profiles with a given tag
     static function getTagged($tagger, $tag) {
         $profile = new Profile();
diff --git a/classes/User.php b/classes/User.php
index b1bae8835..8b0b9acd5 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -40,6 +40,7 @@ class User extends Memcached_DataObject
     public $emailnotifyfav;                  // tinyint(1)   default_1
     public $emailnotifynudge;                // tinyint(1)   default_1
     public $emailnotifymsg;                  // tinyint(1)   default_1
+    public $emailnotifyattn;                 // tinyint(1)   default_1
     public $emailmicroid;                    // tinyint(1)   default_1
     public $language;                        // varchar(50)
     public $timezone;                        // varchar(50)
@@ -62,8 +63,10 @@ class User extends Memcached_DataObject
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('User',$k,$v); }
+    function staticGet($k,$v=NULL)
+    {
+        return Memcached_DataObject::staticGet('User',$k,$v);
+    }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -180,16 +183,16 @@ class User extends Memcached_DataObject
         $profile->nickname = $nickname;
         $profile->profileurl = common_profile_url($nickname);
 
-        if ($fullname) {
+        if (!empty($fullname)) {
             $profile->fullname = $fullname;
         }
-        if ($homepage) {
+        if (!empty($homepage)) {
             $profile->homepage = $homepage;
         }
-        if ($bio) {
+        if (!empty($bio)) {
             $profile->bio = $bio;
         }
-        if ($location) {
+        if (!empty($location)) {
             $profile->location = $location;
         }
 
@@ -197,7 +200,7 @@ class User extends Memcached_DataObject
 
         $id = $profile->insert();
 
-        if (!$id) {
+        if (empty($id)) {
             common_log_db_error($profile, 'INSERT', __FILE__);
             return false;
         }
@@ -207,13 +210,13 @@ class User extends Memcached_DataObject
         $user->id = $id;
         $user->nickname = $nickname;
 
-        if ($password) { # may not have a password for OpenID users
+        if (!empty($password)) { # may not have a password for OpenID users
             $user->password = common_munge_password($password, $id);
         }
 
         # Users who respond to invite email have proven their ownership of that address
 
-        if ($code) {
+        if (!empty($code)) {
             $invite = Invitation::staticGet($code);
             if ($invite && $invite->address && $invite->address_type == 'email' && $invite->address == $email) {
                 $user->email = $invite->address;
@@ -250,7 +253,7 @@ class User extends Memcached_DataObject
             return false;
         }
 
-        if ($email && !$user->email) {
+        if (!empty($email) && !$user->email) {
 
             $confirm = new Confirm_address();
             $confirm->code = common_confirmation_code(128);
@@ -265,7 +268,7 @@ class User extends Memcached_DataObject
             }
         }
 
-        if ($code && $user->email) {
+        if (!empty($code) && $user->email) {
             $user->emailChanged();
         }
 
@@ -338,11 +341,12 @@ class User extends Memcached_DataObject
         {
 
         # 3-way join; probably should get cached
-        $qry = 'SELECT user.* ' .
-          'FROM subscription sub1 JOIN user ON sub1.subscribed = user.id ' .
-          'JOIN subscription sub2 ON user.id = sub2.subscriber ' .
+	$UT = common_config('db','type')=='pgsql'?'"user"':'user';
+        $qry = "SELECT $UT.* " .
+          "FROM subscription sub1 JOIN $UT ON sub1.subscribed = $UT.id " .
+          "JOIN subscription sub2 ON $UT.id = sub2.subscriber " .
           'WHERE sub1.subscriber = %d and sub2.subscribed = %d ' .
-          'ORDER BY user.nickname';
+          "ORDER BY $UT.nickname";
         $user = new User();
         $user->query(sprintf($qry, $this->id, $this->id));
 
@@ -585,7 +589,7 @@ class User extends Memcached_DataObject
           'JOIN profile_tag ON (profile_tag.tagged = subscription.subscriber ' .
           'AND profile_tag.tagger = subscription.subscribed) ' .
           'WHERE subscription.subscribed = %d ' .
-          'AND profile_tag.tag = "%s" ' .
+          "AND profile_tag.tag = '%s' " .
           'AND subscription.subscribed != subscription.subscriber ' .
           'ORDER BY subscription.created DESC ';
 
@@ -613,7 +617,7 @@ class User extends Memcached_DataObject
           'JOIN profile_tag on (profile_tag.tagged = subscription.subscribed ' .
           'AND profile_tag.tagger = subscription.subscriber) ' .
           'WHERE subscription.subscriber = %d ' .
-          'AND profile_tag.tag = "%s" ' .
+          "AND profile_tag.tag = '%s' " .
           'AND subscription.subscribed != subscription.subscriber ' .
           'ORDER BY subscription.created DESC ';
 
@@ -629,4 +633,15 @@ class User extends Memcached_DataObject
 
         return $profile;
     }
+
+    function hasOpenID()
+    {
+        $oid = new User_openid();
+
+        $oid->user_id = $this->id;
+
+        $cnt = $oid->find();
+
+        return ($cnt > 0);
+    }
 }
diff --git a/classes/User_group.php b/classes/User_group.php
index 98ad77cc0..d152f9d56 100755
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -74,94 +74,30 @@ class User_group extends Memcached_DataObject
           'WHERE group_member.group_id = %d ' .
           'ORDER BY group_member.created DESC ';
 
-        if (common_config('db','type') == 'pgsql') {
-            $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-        } else {
-            $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+        if ($limit != null) {
+            if (common_config('db','type') == 'pgsql') {
+                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+            } else {
+                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+            }
         }
 
         $members = new Profile();
 
-        $cnt = $members->query(sprintf($qry, $this->id));
-
+        $members->query(sprintf($qry, $this->id));
         return $members;
     }
 
-    function setOriginal($filename, $type)
+    function setOriginal($filename)
     {
+        $imagefile = new ImageFile($this->id, Avatar::path($filename));
+        
         $orig = clone($this);
-        $this->original_logo = common_avatar_url($filename);
-        $this->homepage_logo = common_avatar_url($this->scale($filename,
-                                                                      AVATAR_PROFILE_SIZE,
-                                                                      $type));
-        $this->stream_logo = common_avatar_url($this->scale($filename,
-                                                                    AVATAR_STREAM_SIZE,
-                                                                      $type));
-        $this->mini_logo = common_avatar_url($this->scale($filename,
-                                                                  AVATAR_MINI_SIZE,
-                                                                  $type));
+        $this->original_logo = Avatar::url($filename);
+        $this->homepage_logo = Avatar::url($imagefile->resize(AVATAR_PROFILE_SIZE));
+        $this->stream_logo = Avatar::url($imagefile->resize(AVATAR_STREAM_SIZE));
+        $this->mini_logo = Avatar::url($imagefile->resize(AVATAR_MINI_SIZE));
         common_debug(common_log_objstring($this));
         return $this->update($orig);
     }
-
-    function scale($filename, $size, $type)
-    {
-        $filepath = common_avatar_path($filename);
-
-        if (!file_exists($filepath)) {
-            $this->serverError(_('Lost our file.'));
-            return;
-        }
-
-        $info = @getimagesize($filepath);
-
-        switch ($type) {
-        case IMAGETYPE_GIF:
-            $image_src = imagecreatefromgif($filepath);
-            break;
-        case IMAGETYPE_JPEG:
-            $image_src = imagecreatefromjpeg($filepath);
-            break;
-        case IMAGETYPE_PNG:
-            $image_src = imagecreatefrompng($filepath);
-            break;
-         default:
-            $this->serverError(_('Unknown file type'));
-            return;
-        }
-
-        $image_dest = imagecreatetruecolor($size, $size);
-
-        $background = imagecolorallocate($image_dest, 0, 0, 0);
-        ImageColorTransparent($image_dest, $background);
-        imagealphablending($image_dest, false);
-
-        imagecopyresized($image_dest, $image_src, 0, 0, $x, $y, $size, $size, $info[0], $info[1]);
-
-        $cur = common_current_user();
-
-        $outname = common_avatar_filename($cur->id,
-                                          image_type_to_extension($type),
-                                          null,
-                                          common_timestamp());
-
-        $outpath = common_avatar_path($outname);
-
-        switch ($type) {
-        case IMAGETYPE_GIF:
-            imagegif($image_dest, $outpath);
-            break;
-        case IMAGETYPE_JPEG:
-            imagejpeg($image_dest, $outpath);
-            break;
-        case IMAGETYPE_PNG:
-            imagepng($image_dest, $outpath);
-            break;
-         default:
-            $this->serverError(_('Unknown file type'));
-            return;
-        }
-
-        return $outname;
-    }
 }
diff --git a/classes/laconica.ini b/classes/laconica.ini
index 255122a97..5fd2cd1f8 100755
--- a/classes/laconica.ini
+++ b/classes/laconica.ini
@@ -292,7 +292,8 @@ created = 142
 modified = 384
 
 [sms_carrier__keys]
-id = N
+id = K
+name = U
 
 [subscription]
 subscriber = 129
@@ -331,6 +332,7 @@ emailnotifysub = 17
 emailnotifyfav = 17
 emailnotifynudge = 17
 emailnotifymsg = 17
+emailnotifyattn = 17
 emailmicroid = 17
 language = 2
 timezone = 2
diff --git a/config.php.sample b/config.php.sample
index db1a21663..a6cada77a 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -18,6 +18,8 @@ $config['site']['server'] = 'localhost';
 $config['site']['path'] = 'laconica';
 #$config['site']['fancy'] = false;
 #$config['site']['theme'] = 'default';
+#To enable the built-in mobile style sheet, defaults to false.
+#$config['site']['mobile'] = true;
 #For contact email, defaults to $_SERVER["SERVER_ADMIN"]
 #$config['site']['email'] = 'admin@example.net';
 #Brought by...
@@ -32,6 +34,9 @@ $config['site']['path'] = 'laconica';
 # If you want logging sent to a file instead of syslog
 #$config['site']['logfile'] = '/tmp/laconica.log';
 
+# Enables extra log information, for example full details of PEAR DB errors
+#$config['site']['logdebug'] = true;
+
 # This is a PEAR DB DSN, see http://pear.php.net/manual/en/package.database.db.intro-dsn.php
 # Set it to match your actual database
 
@@ -107,6 +112,14 @@ $config['sphinx']['port'] = 3312;
 #$config['public']['blacklist'][] = 123;
 #$config['public']['blacklist'][] = 2307;
 
+#Mark certain notice sources as automatic and thus not
+#appropriate for public feed
+#$config['public]['autosource'][] = 'twitterfeed';
+#$config['public]['autosource'][] = 'rssdent';
+#$config['public]['autosource'][] = 'Ping.Fm';
+#$config['public]['autosource'][] = 'HelloTxt';
+#$config['public]['autosource'][] = 'Updating.Me';
+
 #Do notice broadcasts offline
 #If you use this, you must run the six offline daemons in the
 #background. See the README for details.
@@ -139,6 +152,10 @@ $config['sphinx']['port'] = 3312;
 #$config['profile']['banned'][] = 'hacker';
 #$config['profile']['banned'][] = 12345;
 
-# config section for the built-in Facebook application
+# Config section for the built-in Facebook application
 #$config['facebook']['apikey'] = 'APIKEY';
 #$config['facebook']['secret'] = 'SECRET';
+
+# Add Google Analytics
+# require_once('plugins/GoogleAnalyticsPlugin.php');
+# $ga = new GoogleAnalyticsPlugin('your secret code');
diff --git a/db/carrier.sql b/db/carrier.sql
deleted file mode 100644
index 932f7c8bb..000000000
--- a/db/carrier.sql
+++ /dev/null
@@ -1,61 +0,0 @@
-insert into sms_carrier
-    (name, email_pattern, created)
-values
-    ('3 River Wireless', '%s@sms.3rivers.net', now()),
-    ('7-11 Speakout', '%s@cingularme.com', now()),
-    ('Airtel (Karnataka, India)', '%s@airtelkk.com', now()),
-    ('Alaska Communications Systems', '%s@msg.acsalaska.com', now()),
-    ('Alltel Wireless', '%s@message.alltel.com', now()),
-    ('AT&T Wireless', '%s@txt.att.net', now()),
-    ('Bell Mobility (Canada)', '%s@txt.bell.ca', now()),
-    ('Boost Mobile', '%s@myboostmobile.com', now()),
-    ('Cellular One (Dobson)', '%s@mobile.celloneusa.com', now()),
-    ('Cincinnati Bell Wireless', '%s@gocbw.com', now()),
-    ('Cingular (Postpaid)', '%s@cingularme.com', now()),
-    ('Centennial Wireless', '%s@cwemail.com', now()),
-    ('Cingular (GoPhone prepaid)', '%s@cingularme.com', now()),
-    ('Claro (Nicaragua)', '%s@ideasclaro-ca.com', now()),
-    ('Comcel', '%s@comcel.com.co', now()),
-    ('Cricket', '%s@sms.mycricket.com', now()),
-    ('CTI', '%s@sms.ctimovil.com.ar', now()),
-    ('Emtel (Mauritius)', '%s@emtelworld.net', now()),
-    ('Fido (Canada)', '%s@fido.ca', now()),
-    ('General Communications Inc.', '%s@msg.gci.net', now()),
-    ('Globalstar', '%s@msg.globalstarusa.com', now()),
-    ('Helio', '%s@myhelio.com', now()),
-    ('Illinois Valley Cellular', '%s@ivctext.com', now()),
-    ('i wireless', '%s.iws@iwspcs.net', now()),
-    ('Meteor (Ireland)', '%s@sms.mymeteor.ie', now()),
-    ('Mero Mobile (Nepal)', '%s@sms.spicenepal.com', now()),
-    ('MetroPCS', '%s@mymetropcs.com', now()),
-    ('Movicom', '%s@movimensaje.com.ar', now()),
-    ('Mobitel (Sri Lanka)', '%s@sms.mobitel.lk', now()),
-    ('Movistar (Colombia)', '%s@movistar.com.co', now()),
-    ('MTN (South Africa)', '%s@sms.co.za', now()),
-    ('MTS (Canada)', '%s@text.mtsmobility.com', now()),
-    ('Nextel (Argentina)', '%s@nextel.net.ar', now()),
-    ('Orange (Poland)', '%s@orange.pl', now()),
-    ('Orange (UK)', '%s@orange.net', now()),
-    ('Personal (Argentina)', '%s@personal-net.com.ar', now()),
-    ('Plus GSM (Poland)', '%s@text.plusgsm.pl', now()),
-    ('President''s Choice (Canada)', '%s@txt.bell.ca', now()),
-    ('Qwest', '%s@qwestmp.com', now()),
-    ('Rogers (Canada)', '%s@pcs.rogers.com', now()),
-    ('Sasktel (Canada)', '%s@sms.sasktel.com', now()),
-    ('Setar Mobile email (Aruba)', '%s@mas.aw', now()),
-    ('Solo Mobile', '%s@txt.bell.ca', now()),
-    ('Sprint (PCS)', '%s@messaging.sprintpcs.com', now()),
-    ('Sprint (Nextel)', '%s@page.nextel.com', now()),
-    ('Suncom', '%s@tms.suncom.com', now()),
-    ('T-Mobile', '%s@tmomail.net', now()),
-    ('T-Mobile (Austria)', '%s@sms.t-mobile.at', now()),
-    ('Telus Mobility (Canada)', '%s@msg.telus.com', now()),
-    ('Thumb Cellular', '%s@sms.thumbcellular.com', now()),
-    ('Tigo (Formerly Ola)', '%s@sms.tigo.com.co', now()),
-    ('Unicel', '%s@utext.com', now()),
-    ('US Cellular', '%s@email.uscc.net', now()),
-    ('Verizon', '%s@vtext.com', now()),
-    ('Virgin Mobile (Canada)', '%s@vmobile.ca', now()),
-    ('Virgin Mobile (USA)', '%s@vmobl.com', now()),
-    ('Vodafone NZ (txt ''R'' to 901 to enable first)', '%s@sms.vodafone.net.nz', now()),
-    ('YCC', '%s@sms.ycc.ru', now());
diff --git a/db/foreign_services.sql b/db/foreign_services.sql
index 512d42513..557ede024 100644
--- a/db/foreign_services.sql
+++ b/db/foreign_services.sql
@@ -1,8 +1,5 @@
 insert into foreign_service
     (id, name, description, created)
 values
-    ('1','Twitter', 'Twitter Micro-blogging service', now());
-insert into foreign_service
-	(id, name, description, created)
-values
-	('2','Facebook', 'Facebook', now());
+    ('1','Twitter', 'Twitter Micro-blogging service', now()),
+    ('2','Facebook', 'Facebook', now());
diff --git a/db/laconica.sql b/db/laconica.sql
index 012270b51..c2cd887de 100644
--- a/db/laconica.sql
+++ b/db/laconica.sql
@@ -31,7 +31,7 @@ create table avatar (
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
 create table sms_carrier (
-    id integer auto_increment primary key comment 'primary key for SMS carrier',
+    id integer primary key comment 'primary key for SMS carrier',
     name varchar(64) unique key comment 'name of the carrier',
     email_pattern varchar(255) not null comment 'sprintf pattern for making an email address from a phone number',
     created datetime not null comment 'date this record was created',
@@ -50,6 +50,7 @@ create table user (
     emailnotifyfav tinyint default 1 comment 'Notify by email of favorites',
     emailnotifynudge tinyint default 1 comment 'Notify by email of nudges',
     emailnotifymsg tinyint default 1 comment 'Notify by email of direct messages',
+    emailnotifyattn tinyint default 1 comment 'Notify by email of @-replies',
     emailmicroid tinyint default 1 comment 'whether to publish email microid',
     language varchar(50) comment 'preferred language',
     timezone varchar(50) comment 'timezone',
@@ -170,7 +171,7 @@ create table token (
     tok char(32) not null comment 'identifying value',
     secret char(32) not null comment 'secret value',
     type tinyint not null default 0 comment 'request or access',
-    state tinyint default 0 comment 'for requests; 0 = initial, 1 = authorized, 2 = used',
+    state tinyint default 0 comment 'for requests, 0 = initial, 1 = authorized, 2 = used',
 
     created datetime not null comment 'date this record was created',
     modified timestamp comment 'date this record was modified',
@@ -258,7 +259,8 @@ create table notice_tag (
     created datetime not null comment 'date this record was created',
 
     constraint primary key (tag, notice_id),
-    index notice_tag_created_idx (created)
+    index notice_tag_created_idx (created),
+    index notice_tag_notice_id_idx (notice_id)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
 /* Synching with foreign services */
@@ -342,7 +344,7 @@ create table notice_inbox (
     user_id integer not null comment 'user receiving the message' references user (id),
     notice_id integer not null comment 'notice received' references notice (id),
     created datetime not null comment 'date the notice was created',
-    source tinyint default 1 comment 'reason it is in the inbox; 1=subscription',
+    source tinyint default 1 comment 'reason it is in the inbox, 1=subscription',
 
     constraint primary key (user_id, notice_id),
     index notice_inbox_notice_id_idx (notice_id)
@@ -356,7 +358,8 @@ create table profile_tag (
 
    constraint primary key (tagger, tagged, tag),
    index profile_tag_modified_idx (modified),
-   index profile_tag_tagger_tag_idx (tagger, tag)
+   index profile_tag_tagger_tag_idx (tagger, tag),
+   index profile_tag_tagged_idx (tagged)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
 create table profile_block (
@@ -400,7 +403,9 @@ create table group_member (
     created datetime not null comment 'date this record was created',
     modified timestamp comment 'date this record was modified',
 
-    constraint primary key (group_id, profile_id)
+    constraint primary key (group_id, profile_id),
+    index group_member_profile_id_idx (profile_id),
+    index group_member_created_idx (created)
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql
index eb0dfc0ee..2d83f784a 100644
--- a/db/laconica_pg.sql
+++ b/db/laconica_pg.sql
@@ -8,7 +8,7 @@ create table profile (
     homepage varchar(255) /* comment 'identifying URL' */,

     bio varchar(140) /* comment 'descriptive biography' */,

     location varchar(255) /* comment 'physical location' */,

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

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

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

 

     textsearch tsvector

@@ -23,7 +23,7 @@ create table avatar (
     mediatype varchar(32) not null /* comment 'file type' */,

     filename varchar(255) null /* comment 'local filename, if local' */,

     url varchar(255) unique /* comment 'avatar location' */,

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

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

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

 

     primary key(profile_id, width, height)

@@ -34,7 +34,7 @@ create table sms_carrier (
     id serial primary key /* comment 'primary key for SMS carrier' */,

     name varchar(64) unique /* comment 'name of the carrier' */,

     email_pattern varchar(255) not null /* comment 'sprintf pattern for making an email address from a phone number' */,

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

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

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

 );

 

@@ -49,8 +49,9 @@ create table "user" (
     emailnotifysub integer default 1 /* comment 'Notify by email of subscriptions' */,

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

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

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

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

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

+    emailnotifyattn integer default 1 /* command 'Notify by email of @-replies' */, 

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

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

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

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

@@ -68,7 +69,7 @@ emailmicroid integer default 1 /* comment 'whether to publish email microid' */,
     autosubscribe integer default 0 /* comment 'automatically subscribe to users who subscribe to us' */,

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

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

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

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

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

 

 );

@@ -81,18 +82,18 @@ create table remote_profile (
     uri varchar(255) unique /* comment 'universally unique identifier, usually a tag URI' */,

     postnoticeurl varchar(255) /* comment 'URL we use for posting notices' */,

     updateprofileurl varchar(255) /* comment 'URL we use for updates to this profile' */,

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

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

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

 );

 

 create table subscription (

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

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

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

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

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

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

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

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

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

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

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

 

     primary key (subscriber, subscribed)

@@ -108,7 +109,7 @@ create table notice (
     content varchar(140) /* comment 'update content' */,

     rendered text /* comment 'HTML version of the content' */,

     url varchar(255) /* comment 'URL of any attachment (image, video, bookmark, whatever)' */,

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

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

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

     reply_to integer /* comment 'notice replied to (usually a guess)' */ references notice (id) ,

     is_local integer default 0 /* comment 'notice was generated by a user' */,

@@ -123,7 +124,7 @@ create table notice_source (
      code varchar(32) primary key not null /* comment 'source code' */,

      name varchar(255) not null /* comment 'name of the source' */,

      url varchar(255) not null /* comment 'url to link to' */,

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

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

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

 );

 

@@ -131,7 +132,7 @@ create table reply (
 

     notice_id integer not null /* comment 'notice that is the reply' */ references notice (id) ,

     profile_id integer not null /* comment 'profile replied to' */ references profile (id) ,

-    modified timestamp not null default 'now' /* comment 'date this record was modified' */,

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

     replied_id integer /* comment 'notice replied to (not used, see notice.reply_to)' */,

 

     primary key (notice_id, profile_id)

@@ -145,8 +146,7 @@ create table fave (
 

     notice_id integer not null /* comment 'notice that is the favorite' */ references notice (id),

     user_id integer not null /* comment 'user who likes this notice' */ references "user" (id) ,

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

-

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

     primary key (notice_id, user_id)

 

 );

@@ -160,7 +160,7 @@ create table consumer (
     consumer_key varchar(255) primary key /* comment 'unique identifier, root URL' */,

     seed char(32) not null /* comment 'seed for new tokens by this consumer' */,

 

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

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

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

 );

 

@@ -171,7 +171,7 @@ create table token (
     type integer not null default 0 /* comment 'request or access' */,

     state integer default 0 /* comment 'for requests; 0 = initial, 1 = authorized, 2 = used' */,

 

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

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

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

 

     primary key (consumer_key, tok)

@@ -181,9 +181,9 @@ create table nonce (
     consumer_key varchar(255) not null /* comment 'unique identifier, root URL' */,

     tok char(32) not null /* comment 'identifying value' */,

     nonce char(32) not null /* comment 'nonce' */,

-    ts timestamp not null /* comment 'timestamp sent' */,

+    ts integer not null /* comment 'timestamp sent' values are epoch, and only used internally */,

 

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

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

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

 

     primary key (consumer_key, tok, nonce),

@@ -196,7 +196,7 @@ create table user_openid (
     canonical varchar(255) primary key /* comment 'Canonical true URL' */,

     display varchar(255) not null unique /* comment 'URL for viewing, may be different from canonical' */,

     user_id integer not null /* comment 'user owning this URL' */ references "user" (id) ,

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

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

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

 

 );

@@ -242,7 +242,7 @@ create table queue_item (
 

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

     transport varchar(8) not null /* comment 'queue for what? "email", "jabber", "sms", "irc", ...' */,

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

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

     claimed timestamp /* comment 'date this item was claimed' */,

 

     primary key (notice_id, transport)

@@ -254,7 +254,7 @@ create index queue_item_created_idx on queue_item using btree(created);
 create table notice_tag (

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

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

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

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

 

     primary key (tag, notice_id)

 );

@@ -266,31 +266,31 @@ create table foreign_service (
      id int not null primary key /* comment 'numeric key for service' */,

      name varchar(32) not null unique /* comment 'name of the service' */,

      description varchar(255) /* comment 'description' */,

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

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

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

 );

 

 create table foreign_user (

-     id int not null /* comment 'unique numeric key on foreign service' */,

+     id int not null unique /* comment 'unique numeric key on foreign service' */,

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

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

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

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

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

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

      

      primary key (id, service)

 );

-create index foreign_user_user_id_idx on foreign_user using btree(user_id);

 

 create table foreign_link (

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

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

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

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

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

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

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

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

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

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

+     profilesync int not null default 1 /* comment 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming' */,

+     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,foreign_id,service)

 );

@@ -300,7 +300,7 @@ create table foreign_subscription (
      service int not null /* comment 'service where relationship happens' */ references foreign_service(id) ,

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

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

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

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

      

      primary key (service, subscriber, subscribed)

 );

@@ -312,7 +312,7 @@ create table invitation (
      user_id int not null /* comment 'who sent the invitation' */ references "user" (id),

      address varchar(255) not null /* comment 'invitation sent to' */,

      address_type varchar(8) not null /* comment 'address type ("email", "jabber", "sms") '*/,

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

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

 

 );

 create index invitation_address_idx on invitation using btree(address,address_type);

@@ -327,7 +327,7 @@ create table message (
     content varchar(140) /* comment 'message content' */,

     rendered text /* comment 'HTML version of the content' */,

     url varchar(255) /* comment 'URL of any attachment (image, video, bookmark, whatever)' */,

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

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

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

     source varchar(32) /* comment 'source of comment, like "web", "im", or "clientname"' */

     

@@ -338,14 +338,14 @@ create index message_created_idx on message using btree(created);
 

 create table notice_inbox (

 

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

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

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

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

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date the notice was created' */,

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

 

     primary key (user_id, notice_id)

 );

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

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

 

 create table profile_tag (

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

@@ -360,7 +360,7 @@ create index profile_tag_tagger_tag_idx on profile_tag using btree(tagger,tag);
 

 create table profile_block (

 

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

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

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

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

 

@@ -368,6 +368,59 @@ create table profile_block (
 

 );

 

+create table user_group (

+

+    id serial primary key /* comment 'unique identifier' */,

+

+    nickname varchar(64) unique /* comment 'nickname for addressing' */,

+    fullname varchar(255) /* comment 'display name' */,

+    homepage varchar(255) /* comment 'URL, cached so we dont regenerate' */,

+    description varchar(140) /* comment 'descriptive biography' */,

+    location varchar(255) /* comment 'related physical location, if any' */,

+

+    original_logo varchar(255) /* comment 'original size logo' */,

+    homepage_logo varchar(255) /* comment 'homepage (profile) size logo' */,

+    stream_logo varchar(255) /* comment 'stream-sized logo' */,

+    mini_logo varchar(255) /* comment 'mini logo' */,

+

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

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

+

+);

+create index user_group_nickname_idx on user_group using btree(nickname);

+

+create table group_member (

+

+    group_id integer not null /* comment 'foreign key to user_group' */ references user_group (id),

+    profile_id integer not null /* comment 'foreign key to profile table' */ references profile (id),

+    is_admin integer default 0 /* comment 'is this user an admin?' */,

+

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

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

+

+    primary key (group_id, profile_id)

+);

+

+create table related_group (

+

+    group_id integer not null /* comment 'foreign key to user_group' */ references user_group (id) ,

+    related_group_id integer not null /* comment 'foreign key to user_group' */ references user_group (id),

+

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

+

+    primary key (group_id, related_group_id)

+

+);

+

+create table group_inbox (

+    group_id integer not null /* comment 'group receiving the message' references user_group (id) */,

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

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date the notice was created' */,

+

+    primary key (group_id, notice_id)

+);

+create index group_inbox_created_idx on group_inbox using btree(created);

+

 /* Textsearch stuff */

 

 create index textsearch_idx on profile using gist(textsearch);

diff --git a/db/notice_source.sql b/db/notice_source.sql
new file mode 100644
index 000000000..ea04862e0
--- /dev/null
+++ b/db/notice_source.sql
@@ -0,0 +1,46 @@
+INSERT INTO notice_source
+    (code, name, url, created)
+VALUES
+    ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()),
+    ('Facebook','Facebook','http://apps.facebook.com/identica/', now()),
+    ('Gwibber','Gwibber','http://launchpad.net/gwibber', now()),
+    ('HelloTxt','HelloTxt','http://hellotxt.com/', now()),
+    ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
+    ('LaTwit','LaTwit','http://latwit.mac65.com/', now()),
+    ('Nambu','Nambu','http://www.nambu.com/', now()),
+    ('Pikchur','Pikchur','http://www.pikchur.com/', now()),
+    ('Ping.fm','Ping.fm','http://ping.fm/', now()),
+    ('Twidge','Twidge','http://software.complete.org/twidge', now()),
+    ('Updating.Me','Updating.Me','http://updating.me/', now()),
+    ('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', now()),
+    ('bti','bti','http://gregkh.github.com/bti/', now()),
+    ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()),
+    ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),
+    ('identichat','identichat','http://identichat.prosody.im/', now()),
+    ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
+    ('mbpidgin','mbpidgin','http://code.google.com/p/microblog-purple/', now()),
+    ('moconica','Moconica','http://moconica.com/', now()),
+    ('pocketwit','PockeTwit','http://code.google.com/p/pocketwit/', now()),
+    ('posty','Posty','http://spreadingfunkyness.com/posty/', now()),
+    ('royalewithcheese','Royale With Cheese','http://p.hellyeah.org/', now()),
+    ('rssdent','rssdent','http://github.com/zcopley/rssdent/tree/master', now()),
+    ('rygh.no','rygh.no','http://rygh.no/', now()),
+    ('ryghsms','ryghsms','http://sms.rygh.no/', now()),
+    ('smob','SMOB','http://smob.sioc-project.org/', now()),
+    ('spaz','Spaz','http://funkatron.com/spaz', now()),
+    ('tarpipe','tarpipe','http://tarpipe.com/', now()),
+    ('tjunar','Tjunar','http://nederflash.nl/boek/titels/tjunar-air', now()),
+    ('tr.im','tr.im','http://tr.im/', now()),
+    ('tweenky','Tweenky','http://beta.tweenky.com/', now()),
+    ('twhirl','Twhirl','http://www.twhirl.org/', now()),
+    ('twibble','twibble','http://www.twibble.de/', now()),
+    ('twidge','Twidge','http://software.complete.org/twidge', now()),
+    ('twidroid','twidroid','http://www.twidroid.com/', now()),
+    ('twittelator','Twittelator','http://www.stone.com/iPhone/Twittelator/', now()),
+    ('twitterfeed','twitterfeed','http://twitterfeed.com/', now()),
+    ('twitterphoto','TwitterPhoto','http://richfish.org/twitterphoto/', now()),
+    ('twitterpm','Net::Twitter','http://search.cpan.org/dist/Net-Twitter/', now()),
+    ('twittertools','Twitter Tools','http://wordpress.org/extend/plugins/twitter-tools/', now()),
+    ('twitux','Twitux','http://live.gnome.org/DanielMorales/Twitux', now()),
+    ('twitvim','TwitVim','http://vim.sourceforge.net/scripts/script.php?script_id=2204', now()),
+    ('urfastr','urfastr','http://urfastr.net/', now());
diff --git a/db/sms_carrier.sql b/db/sms_carrier.sql
new file mode 100644
index 000000000..6879f2089
--- /dev/null
+++ b/db/sms_carrier.sql
@@ -0,0 +1,63 @@
+INSERT INTO sms_carrier
+    (id, name, email_pattern, created)
+VALUES
+    (100056, '3 River Wireless', '%s@sms.3rivers.net', now()),
+    (100057, '7-11 Speakout', '%s@cingularme.com', now()),
+    (100058, 'Airtel (Karnataka, India)', '%s@airtelkk.com', now()),
+    (100059, 'Alaska Communications Systems', '%s@msg.acsalaska.com', now()),
+    (100060, 'Alltel Wireless', '%s@message.alltel.com', now()),
+    (100061, 'AT&T Wireless', '%s@txt.att.net', now()),
+    (100062, 'Bell Mobility (Canada)', '%s@txt.bell.ca', now()),
+    (100063, 'Boost Mobile', '%s@myboostmobile.com', now()),
+    (100064, 'Cellular One (Dobson)', '%s@mobile.celloneusa.com', now()),
+    (100065, 'Cingular (Postpaid)', '%s@cingularme.com', now()),
+    (100066, 'Centennial Wireless', '%s@cwemail.com', now()),
+    (100067, 'Cingular (GoPhone prepaid)', '%s@cingularme.com', now()),
+    (100068, 'Claro (Nicaragua)', '%s@ideasclaro-ca.com', now()),
+    (100069, 'Comcel', '%s@comcel.com.co', now()),
+    (100070, 'Cricket', '%s@sms.mycricket.com', now()),
+    (100071, 'CTI', '%s@sms.ctimovil.com.ar', now()),
+    (100072, 'Emtel (Mauritius)', '%s@emtelworld.net', now()),
+    (100073, 'Fido (Canada)', '%s@fido.ca', now()),
+    (100074, 'General Communications Inc.', '%s@msg.gci.net', now()),
+    (100075, 'Globalstar', '%s@msg.globalstarusa.com', now()),
+    (100076, 'Helio', '%s@myhelio.com', now()),
+    (100077, 'Illinois Valley Cellular', '%s@ivctext.com', now()),
+    (100078, 'i wireless', '%s.iws@iwspcs.net', now()),
+    (100079, 'Meteor (Ireland)', '%s@sms.mymeteor.ie', now()),
+    (100080, 'Mero Mobile (Nepal)', '%s@sms.spicenepal.com', now()),
+    (100081, 'MetroPCS', '%s@mymetropcs.com', now()),
+    (100082, 'Movicom', '%s@movimensaje.com.ar', now()),
+    (100083, 'Mobitel (Sri Lanka)', '%s@sms.mobitel.lk', now()),
+    (100084, 'Movistar (Colombia)', '%s@movistar.com.co', now()),
+    (100085, 'MTN (South Africa)', '%s@sms.co.za', now()),
+    (100086, 'MTS (Canada)', '%s@text.mtsmobility.com', now()),
+    (100087, 'Nextel (Argentina)', '%s@nextel.net.ar', now()),
+    (100088, 'Orange (Poland)', '%s@orange.pl', now()),
+    (100089, 'Personal (Argentina)', '%s@personal-net.com.ar', now()),
+    (100090, 'Plus GSM (Poland)', '%s@text.plusgsm.pl', now()),
+    (100091, 'President\'s Choice (Canada)', '%s@txt.bell.ca', now()),
+    (100092, 'Qwest', '%s@qwestmp.com', now()),
+    (100093, 'Rogers (Canada)', '%s@pcs.rogers.com', now()),
+    (100094, 'Sasktel (Canada)', '%s@sms.sasktel.com', now()),
+    (100095, 'Setar Mobile email (Aruba)', '%s@mas.aw', now()),
+    (100096, 'Solo Mobile', '%s@txt.bell.ca', now()),
+    (100097, 'Sprint (PCS)', '%s@messaging.sprintpcs.com', now()),
+    (100098, 'Sprint (Nextel)', '%s@page.nextel.com', now()),
+    (100099, 'Suncom', '%s@tms.suncom.com', now()),
+    (100100, 'T-Mobile', '%s@tmomail.net', now()),
+    (100101, 'T-Mobile (Austria)', '%s@sms.t-mobile.at', now()),
+    (100102, 'Telus Mobility (Canada)', '%s@msg.telus.com', now()),
+    (100103, 'Thumb Cellular', '%s@sms.thumbcellular.com', now()),
+    (100104, 'Tigo (Formerly Ola)', '%s@sms.tigo.com.co', now()),
+    (100105, 'Unicel', '%s@utext.com', now()),
+    (100106, 'US Cellular', '%s@email.uscc.net', now()),
+    (100107, 'Verizon', '%s@vtext.com', now()),
+    (100108, 'Virgin Mobile (Canada)', '%s@vmobile.ca', now()),
+    (100109, 'Virgin Mobile (USA)', '%s@vmobl.com', now()),
+    (100110, 'YCC', '%s@sms.ycc.ru', now()),
+    (100111, 'Orange (UK)', '%s@orange.net', now()),
+    (100112, 'Cincinnati Bell Wireless', '%s@gocbw.com', now()),
+    (100113, 'T-Mobile Germany', '%s@t-mobile-sms.de', now()),
+    (100114, 'Vodafone Germany', '%s@vodafone-sms.de', now()),
+    (100115, 'E-Plus', '%s@smsmail.eplus.de', now());
diff --git a/doc/about b/doc-src/about
index 3036a51b9..3036a51b9 100644
--- a/doc/about
+++ b/doc-src/about
diff --git a/doc-src/badge b/doc-src/badge
new file mode 100644
index 000000000..1c368eb69
--- /dev/null
+++ b/doc-src/badge
@@ -0,0 +1,65 @@
+Install the %%site.name%% badge on you blog or web site to show the latest updates 
+from you and your friends!
+
+<MTMarkdownOptions output='raw'>
+<script type="text/javascript" src="http://identi.ca/js/identica-badge.js">
+{
+   "user":"kentbrew",
+   "server":"identi.ca",
+   "headerText":" and friends"
+}
+</script>
+</MTMarkdownOptions>
+
+Things to try
+--------------
+
+* Click an avatar and the badge will refresh with that user's timeline
+* Click a nickname to open a user's profile in your browser
+* Click a notice's timestamp to view the notice in your browser
+* @-replies and #tags are live links
+
+## Installation instructions 
+
+Copy and paste the following JavaScript into an HTML page where
+you want the badge to show up.  Substitute your own ID in the user
+parameter.
+
+<pre>
+	&lt;script type=&quot;text/javascript&quot; src=&quot;http://identi.ca/js/identica-badge.js&quot;&gt;
+	{
+	   &quot;user&quot;:&quot;kentbrew&quot;,
+	   &quot;server&quot;:&quot;identi.ca&quot;,
+	   &quot;headerText&quot;:&quot; and friends&quot;
+	}
+	&lt;/script&gt;
+
+</pre>
+
+
+
+Valid parameters for the badge:
+-------------------------------
+
+* user : defaults to 7000 (@kentbrew)
+* headerText  : defaults to empty
+* height : defaults to 350px
+* width : defaults to 300px
+* background : defaults to #193441. If you set evenBackground, oddBackground,
+  and headerBackground, you won't see it at all.
+* border : defaults to 1px solid black
+* userColor : defaults to whatever link color is set to on your page
+* headerBackground : defaults to transparent 
+* headerColor :  defaults to white
+* evenBackground : defaults to #fff
+* oddBackground : defaults to #eee
+* thumbnailBorder : 1px solid black
+* thumbnailSize : defaults to 24px
+* padding : defaults to 3px
+* server : defaults to identi.ca
+
+Licence
+-------
+
+Identi.ca badge by [Kent Brewster](http://kentbrewster.com/identica-badge/). 
+Licenced under [CC-BY-SA-3](http://kentbrewster.com/rights-and-permissions/).
diff --git a/doc/contact b/doc-src/contact
index a8efc456a..a8efc456a 100644
--- a/doc/contact
+++ b/doc-src/contact
diff --git a/doc/faq b/doc-src/faq
index 31582b9f0..31582b9f0 100644
--- a/doc/faq
+++ b/doc-src/faq
diff --git a/doc/groups b/doc-src/groups
index 645390e0c..645390e0c 100644
--- a/doc/groups
+++ b/doc-src/groups
diff --git a/doc/help b/doc-src/help
index a8cfccd2b..a8cfccd2b 100644
--- a/doc/help
+++ b/doc-src/help
diff --git a/doc/im b/doc-src/im
index da07f9fe7..da07f9fe7 100644
--- a/doc/im
+++ b/doc-src/im
diff --git a/doc/openid b/doc-src/openid
index c741e3674..c741e3674 100644
--- a/doc/openid
+++ b/doc-src/openid
diff --git a/doc/openmublog b/doc-src/openmublog
index 6e3abee42..6e3abee42 100644
--- a/doc/openmublog
+++ b/doc-src/openmublog
diff --git a/doc/privacy b/doc-src/privacy
index 90c7b3c7f..90c7b3c7f 100644
--- a/doc/privacy
+++ b/doc-src/privacy
diff --git a/doc/sms b/doc-src/sms
index 1beb49786..1beb49786 100644
--- a/doc/sms
+++ b/doc-src/sms
diff --git a/doc/source b/doc-src/source
index 83debbe53..83debbe53 100644
--- a/doc/source
+++ b/doc-src/source
diff --git a/doc/tags b/doc-src/tags
index 2ed352e70..2ed352e70 100644
--- a/doc/tags
+++ b/doc-src/tags
diff --git a/extlib/Net/URL.php b/extlib/Net/URL.php
new file mode 100644
index 000000000..3dcfef60d
--- /dev/null
+++ b/extlib/Net/URL.php
@@ -0,0 +1,485 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Copyright (c) 2002-2004, Richard Heyes                                |
+// | All rights reserved.                                                  |
+// |                                                                       |
+// | Redistribution and use in source and binary forms, with or without    |
+// | modification, are permitted provided that the following conditions    |
+// | are met:                                                              |
+// |                                                                       |
+// | o Redistributions of source code must retain the above copyright      |
+// |   notice, this list of conditions and the following disclaimer.       |
+// | o Redistributions in binary form must reproduce the above copyright   |
+// |   notice, this list of conditions and the following disclaimer in the |
+// |   documentation and/or other materials provided with the distribution.|
+// | o The names of the authors may not be used to endorse or promote      |
+// |   products derived from this software without specific prior written  |
+// |   permission.                                                         |
+// |                                                                       |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
+// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  |
+// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
+// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      |
+// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
+// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
+// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   |
+// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
+// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  |
+// |                                                                       |
+// +-----------------------------------------------------------------------+
+// | Author: Richard Heyes <richard at php net>                            |
+// +-----------------------------------------------------------------------+
+//
+// $Id: URL.php,v 1.49 2007/06/28 14:43:07 davidc Exp $
+//
+// Net_URL Class
+
+
+class Net_URL
+{
+    var $options = array('encode_query_keys' => false);
+    /**
+    * Full url
+    * @var string
+    */
+    var $url;
+
+    /**
+    * Protocol
+    * @var string
+    */
+    var $protocol;
+
+    /**
+    * Username
+    * @var string
+    */
+    var $username;
+
+    /**
+    * Password
+    * @var string
+    */
+    var $password;
+
+    /**
+    * Host
+    * @var string
+    */
+    var $host;
+
+    /**
+    * Port
+    * @var integer
+    */
+    var $port;
+
+    /**
+    * Path
+    * @var string
+    */
+    var $path;
+
+    /**
+    * Query string
+    * @var array
+    */
+    var $querystring;
+
+    /**
+    * Anchor
+    * @var string
+    */
+    var $anchor;
+
+    /**
+    * Whether to use []
+    * @var bool
+    */
+    var $useBrackets;
+
+    /**
+    * PHP4 Constructor
+    *
+    * @see __construct()
+    */
+    function Net_URL($url = null, $useBrackets = true)
+    {
+        $this->__construct($url, $useBrackets);
+    }
+
+    /**
+    * PHP5 Constructor
+    *
+    * Parses the given url and stores the various parts
+    * Defaults are used in certain cases
+    *
+    * @param string $url         Optional URL
+    * @param bool   $useBrackets Whether to use square brackets when
+    *                            multiple querystrings with the same name
+    *                            exist
+    */
+    function __construct($url = null, $useBrackets = true)
+    {
+        $this->url = $url;
+        $this->useBrackets = $useBrackets;
+
+        $this->initialize();
+    }
+
+    function initialize()
+    {
+        $HTTP_SERVER_VARS  = !empty($_SERVER) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
+
+        $this->user        = '';
+        $this->pass        = '';
+        $this->host        = '';
+        $this->port        = 80;
+        $this->path        = '';
+        $this->querystring = array();
+        $this->anchor      = '';
+
+        // Only use defaults if not an absolute URL given
+        if (!preg_match('/^[a-z0-9]+:\/\//i', $this->url)) {
+            $this->protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 'https' : 'http');
+
+            /**
+            * Figure out host/port
+            */
+            if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) && 
+                preg_match('/^(.*)(:([0-9]+))?$/U', $HTTP_SERVER_VARS['HTTP_HOST'], $matches)) 
+            {
+                $host = $matches[1];
+                if (!empty($matches[3])) {
+                    $port = $matches[3];
+                } else {
+                    $port = $this->getStandardPort($this->protocol);
+                }
+            }
+
+            $this->user        = '';
+            $this->pass        = '';
+            $this->host        = !empty($host) ? $host : (isset($HTTP_SERVER_VARS['SERVER_NAME']) ? $HTTP_SERVER_VARS['SERVER_NAME'] : 'localhost');
+            $this->port        = !empty($port) ? $port : (isset($HTTP_SERVER_VARS['SERVER_PORT']) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $this->getStandardPort($this->protocol));
+            $this->path        = !empty($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : '/';
+            $this->querystring = isset($HTTP_SERVER_VARS['QUERY_STRING']) ? $this->_parseRawQuerystring($HTTP_SERVER_VARS['QUERY_STRING']) : null;
+            $this->anchor      = '';
+        }
+
+        // Parse the url and store the various parts
+        if (!empty($this->url)) {
+            $urlinfo = parse_url($this->url);
+
+            // Default querystring
+            $this->querystring = array();
+
+            foreach ($urlinfo as $key => $value) {
+                switch ($key) {
+                    case 'scheme':
+                        $this->protocol = $value;
+                        $this->port     = $this->getStandardPort($value);
+                        break;
+
+                    case 'user':
+                    case 'pass':
+                    case 'host':
+                    case 'port':
+                        $this->$key = $value;
+                        break;
+
+                    case 'path':
+                        if ($value{0} == '/') {
+                            $this->path = $value;
+                        } else {
+                            $path = dirname($this->path) == DIRECTORY_SEPARATOR ? '' : dirname($this->path);
+                            $this->path = sprintf('%s/%s', $path, $value);
+                        }
+                        break;
+
+                    case 'query':
+                        $this->querystring = $this->_parseRawQueryString($value);
+                        break;
+
+                    case 'fragment':
+                        $this->anchor = $value;
+                        break;
+                }
+            }
+        }
+    }
+    /**
+    * Returns full url
+    *
+    * @return string Full url
+    * @access public
+    */
+    function getURL()
+    {
+        $querystring = $this->getQueryString();
+
+        $this->url = $this->protocol . '://'
+                   . $this->user . (!empty($this->pass) ? ':' : '')
+                   . $this->pass . (!empty($this->user) ? '@' : '')
+                   . $this->host . ($this->port == $this->getStandardPort($this->protocol) ? '' : ':' . $this->port)
+                   . $this->path
+                   . (!empty($querystring) ? '?' . $querystring : '')
+                   . (!empty($this->anchor) ? '#' . $this->anchor : '');
+
+        return $this->url;
+    }
+
+    /**
+    * Adds or updates a querystring item (URL parameter).
+    * Automatically encodes parameters with rawurlencode() if $preencoded
+    *  is false.
+    * You can pass an array to $value, it gets mapped via [] in the URL if
+    * $this->useBrackets is activated.
+    *
+    * @param  string $name       Name of item
+    * @param  string $value      Value of item
+    * @param  bool   $preencoded Whether value is urlencoded or not, default = not
+    * @access public
+    */
+    function addQueryString($name, $value, $preencoded = false)
+    {
+        if ($this->getOption('encode_query_keys')) {
+            $name = rawurlencode($name);
+        }
+
+        if ($preencoded) {
+            $this->querystring[$name] = $value;
+        } else {
+            $this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value): rawurlencode($value);
+        }
+    }
+
+    /**
+    * Removes a querystring item
+    *
+    * @param  string $name Name of item
+    * @access public
+    */
+    function removeQueryString($name)
+    {
+        if ($this->getOption('encode_query_keys')) {
+            $name = rawurlencode($name);
+        }
+
+        if (isset($this->querystring[$name])) {
+            unset($this->querystring[$name]);
+        }
+    }
+
+    /**
+    * Sets the querystring to literally what you supply
+    *
+    * @param  string $querystring The querystring data. Should be of the format foo=bar&x=y etc
+    * @access public
+    */
+    function addRawQueryString($querystring)
+    {
+        $this->querystring = $this->_parseRawQueryString($querystring);
+    }
+
+    /**
+    * Returns flat querystring
+    *
+    * @return string Querystring
+    * @access public
+    */
+    function getQueryString()
+    {
+        if (!empty($this->querystring)) {
+            foreach ($this->querystring as $name => $value) {
+                // Encode var name
+                $name = rawurlencode($name);
+
+                if (is_array($value)) {
+                    foreach ($value as $k => $v) {
+                        $querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name . '=' . $v);
+                    }
+                } elseif (!is_null($value)) {
+                    $querystring[] = $name . '=' . $value;
+                } else {
+                    $querystring[] = $name;
+                }
+            }
+            $querystring = implode(ini_get('arg_separator.output'), $querystring);
+        } else {
+            $querystring = '';
+        }
+
+        return $querystring;
+    }
+
+    /**
+    * Parses raw querystring and returns an array of it
+    *
+    * @param  string  $querystring The querystring to parse
+    * @return array                An array of the querystring data
+    * @access private
+    */
+    function _parseRawQuerystring($querystring)
+    {
+        $parts  = preg_split('/[' . preg_quote(ini_get('arg_separator.input'), '/') . ']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
+        $return = array();
+
+        foreach ($parts as $part) {
+            if (strpos($part, '=') !== false) {
+                $value = substr($part, strpos($part, '=') + 1);
+                $key   = substr($part, 0, strpos($part, '='));
+            } else {
+                $value = null;
+                $key   = $part;
+            }
+
+            if (!$this->getOption('encode_query_keys')) {
+                $key = rawurldecode($key);
+            }
+
+            if (preg_match('#^(.*)\[([0-9a-z_-]*)\]#i', $key, $matches)) {
+                $key = $matches[1];
+                $idx = $matches[2];
+
+                // Ensure is an array
+                if (empty($return[$key]) || !is_array($return[$key])) {
+                    $return[$key] = array();
+                }
+
+                // Add data
+                if ($idx === '') {
+                    $return[$key][] = $value;
+                } else {
+                    $return[$key][$idx] = $value;
+                }
+            } elseif (!$this->useBrackets AND !empty($return[$key])) {
+                $return[$key]   = (array)$return[$key];
+                $return[$key][] = $value;
+            } else {
+                $return[$key] = $value;
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+    * Resolves //, ../ and ./ from a path and returns
+    * the result. Eg:
+    *
+    * /foo/bar/../boo.php    => /foo/boo.php
+    * /foo/bar/../../boo.php => /boo.php
+    * /foo/bar/.././/boo.php => /foo/boo.php
+    *
+    * This method can also be called statically.
+    *
+    * @param  string $path URL path to resolve
+    * @return string      The result
+    */
+    function resolvePath($path)
+    {
+        $path = explode('/', str_replace('//', '/', $path));
+
+        for ($i=0; $i<count($path); $i++) {
+            if ($path[$i] == '.') {
+                unset($path[$i]);
+                $path = array_values($path);
+                $i--;
+
+            } elseif ($path[$i] == '..' AND ($i > 1 OR ($i == 1 AND $path[0] != '') ) ) {
+                unset($path[$i]);
+                unset($path[$i-1]);
+                $path = array_values($path);
+                $i -= 2;
+
+            } elseif ($path[$i] == '..' AND $i == 1 AND $path[0] == '') {
+                unset($path[$i]);
+                $path = array_values($path);
+                $i--;
+
+            } else {
+                continue;
+            }
+        }
+
+        return implode('/', $path);
+    }
+
+    /**
+    * Returns the standard port number for a protocol
+    *
+    * @param  string  $scheme The protocol to lookup
+    * @return integer         Port number or NULL if no scheme matches
+    *
+    * @author Philippe Jausions <Philippe.Jausions@11abacus.com>
+    */
+    function getStandardPort($scheme)
+    {
+        switch (strtolower($scheme)) {
+            case 'http':    return 80;
+            case 'https':   return 443;
+            case 'ftp':     return 21;
+            case 'imap':    return 143;
+            case 'imaps':   return 993;
+            case 'pop3':    return 110;
+            case 'pop3s':   return 995;
+            default:        return null;
+       }
+    }
+
+    /**
+    * Forces the URL to a particular protocol
+    *
+    * @param string  $protocol Protocol to force the URL to
+    * @param integer $port     Optional port (standard port is used by default)
+    */
+    function setProtocol($protocol, $port = null)
+    {
+        $this->protocol = $protocol;
+        $this->port     = is_null($port) ? $this->getStandardPort($protocol) : $port;
+    }
+
+    /**
+     * Set an option
+     *
+     * This function set an option
+     * to be used thorough the script.
+     *
+     * @access public
+     * @param  string $optionName  The optionname to set
+     * @param  string $value       The value of this option.
+     */
+    function setOption($optionName, $value)
+    {
+        if (!array_key_exists($optionName, $this->options)) {
+            return false;
+        }
+
+        $this->options[$optionName] = $value;
+        $this->initialize();
+    }
+
+    /**
+     * Get an option
+     *
+     * This function gets an option
+     * from the $this->options array
+     * and return it's value.
+     *
+     * @access public
+     * @param  string $opionName  The name of the option to retrieve
+     * @see    $this->options
+     */
+    function getOption($optionName)
+    {
+        if (!isset($this->options[$optionName])) {
+            return false;
+        }
+
+        return $this->options[$optionName];
+    }
+
+}
+?>
diff --git a/extlib/Net/URL/Mapper.php b/extlib/Net/URL/Mapper.php
new file mode 100644
index 000000000..65e38818b
--- /dev/null
+++ b/extlib/Net/URL/Mapper.php
@@ -0,0 +1,324 @@
+<?php
+/**
+ * URL parser and mapper
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ * 
+ * Copyright (c) 2006, Bertrand Mansion <golgote@mamasam.com>
+ * 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   Net
+ * @package    Net_URL_Mapper
+ * @author     Bertrand Mansion <golgote@mamasam.com>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    CVS: $Id: Mapper.php,v 1.1 2007/03/28 10:23:04 mansion Exp $
+ * @link       http://pear.php.net/package/Net_URL_Mapper
+ */
+
+require_once 'Net/URL/Mapper/Path.php';
+require_once 'Net/URL/Mapper/Exception.php';
+
+/**
+ * URL parser and mapper class
+ *
+ * This class takes an URL and a configuration and returns formatted data
+ * about the request according to a configuration parameter
+ *
+ * @category   Net
+ * @package    Net_URL_Mapper
+ * @author     Bertrand Mansion <golgote@mamasam.com>
+ * @version    Release: @package_version@
+ */
+class Net_URL_Mapper
+{
+    /**
+    * Array of Net_URL_Mapper instances
+    * @var array
+    */
+    private static $instances = array();
+
+    /**
+    * Mapped paths collection
+    * @var array
+    */
+    protected $paths = array();
+
+    /**
+    * Prefix used for url mapping
+    * @var string
+    */
+    protected $prefix = '';
+
+    /**
+    * Optional scriptname if mod_rewrite is not available
+    * @var string
+    */
+    protected $scriptname = '';
+
+    /**
+    * Mapper instance id
+    * @var string
+    */
+    protected $id = '__default__';
+
+    /**
+    * Class constructor
+    * Constructor is private, you should use getInstance() instead.
+    */
+    private function __construct() { }
+
+    /**
+    * Returns a singleton object corresponding to the requested instance id
+    * @param  string    Requested instance name
+    * @return Object    Net_URL_Mapper Singleton
+    */
+    public static function getInstance($id = '__default__')
+    {
+        if (!isset(self::$instances[$id])) {
+            $m = new Net_URL_Mapper();
+            $m->id = $id;
+            self::$instances[$id] = $m;
+        }
+        return self::$instances[$id];
+    }
+
+    /**
+    * Returns the instance id
+    * @return   string  Mapper instance id
+    */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+    * Parses a path and creates a connection
+    * @param    string  The path to connect
+    * @param    array   Default values for path parts
+    * @param    array   Regular expressions for path parts
+    * @return   object  Net_URL_Mapper_Path
+    */
+    public function connect($path, $defaults = array(), $rules = array())
+    {
+        $pathObj = new Net_URL_Mapper_Path($path, $defaults, $rules);
+        $this->addPath($pathObj);
+        return $pathObj;
+    }
+
+    /**
+    * Set the url prefix if needed
+    *
+    * Example: using the prefix to differenciate mapper instances
+    * <code>
+    * $fr = Net_URL_Mapper::getInstance('fr');
+    * $fr->setPrefix('/fr');
+    * $en = Net_URL_Mapper::getInstance('en');
+    * $en->setPrefix('/en');
+    * </code>
+    *
+    * @param    string  URL prefix
+    */
+    public function setPrefix($prefix)
+    {
+        $this->prefix = '/'.trim($prefix, '/');
+    }
+
+    /**
+    * Set the scriptname if mod_rewrite not available
+    *
+    * Example: will match and generate url like
+    * - index.php/view/product/1
+    * <code>
+    * $m = Net_URL_Mapper::getInstance();
+    * $m->setScriptname('index.php');
+    * </code>
+    * @param    string  URL prefix
+    */
+    public function setScriptname($scriptname)
+    {
+        $this->scriptname = $scriptname;
+    }
+
+    /**
+    * Will attempt to match an url with a defined path
+    *
+    * If an url corresponds to a path, the resulting values are returned
+    * in an array. If none is found, null is returned. In case an url is
+    * matched but its content doesn't validate the path rules, an exception is
+    * thrown.
+    *
+    * @param    string  URL
+    * @return   array|null   array if match found, null otherwise
+    * @throws   Net_URL_Mapper_InvalidException
+    */
+    public function match($url)
+    {
+        $nurl = '/'.trim($url, '/');
+
+        // Remove scriptname if needed
+        
+        if (!empty($this->scriptname) &&
+            strpos($nurl, $this->scriptname) === 0) {
+            $nurl = substr($nurl, strlen($this->scriptname));
+            if (empty($nurl)) {
+                $nurl = '/';
+            }
+        }
+
+        // Remove prefix
+        
+        if (!empty($this->prefix)) {
+            if (strpos($nurl, $this->prefix) !== 0) {
+                return null;
+            }
+            $nurl = substr($nurl, strlen($this->prefix));
+            if (empty($nurl)) {
+                $nurl = '/';
+            }
+        }
+        
+        // Remove query string
+        
+        if (($pos = strpos($nurl, '?')) !== false) {
+            $nurl = substr($nurl, 0, $pos);
+        }
+
+        $paths = array();
+        $values = null;
+
+        // Make a list of paths that conform to route format
+
+        foreach ($this->paths as $path) {
+            $regex = $path->getFormat();
+            if (preg_match($regex, $nurl)) {
+                $paths[] = $path;
+            }   
+        }
+
+        // Make sure one of the paths found is valid
+
+        foreach ($paths as $path) {
+            $regex = $path->getRule();
+            if (preg_match($regex, $nurl, $matches)) {
+                $values = $path->getDefaults();
+                array_shift($matches);
+                $clean = array();
+                foreach ($matches as $k => $v) {
+                    $v = trim($v, '/');
+                    if (!is_int($k) && $v !== '') {
+                        $values[$k] = $v;
+                    }
+                }
+                break;
+            }
+        }
+
+        // A path conforms but does not validate
+
+        if (is_null($values) && !empty($paths)) {
+            $e = new Net_URL_Mapper_InvalidException('A path was found but is invalid.');
+            $e->setPath($paths[0]);
+            $e->setUrl($url);
+            throw $e;
+        }
+
+        return $values;
+    }
+
+    /**
+    * Generate an url based on given parameters
+    *
+    * Will attempt to find a path definition that matches the given parameters and
+    * will generate an url based on this path.
+    *
+    * @param    array   Values to be used for the url generation
+    * @param    array   Key/value pairs for query string if needed
+    * @param    string  Anchor (fragment) if needed
+    * @return   string|false    String if a rule was found, false otherwise
+    */
+    public function generate($values = array(), $qstring = array(), $anchor = '')
+    {
+        // Use root path if any
+
+        if (empty($values) && isset($this->paths['/'])) {
+            return $this->scriptname.$this->prefix.$this->paths['/']->generate($values, $qstring, $anchor);
+        }
+
+        foreach ($this->paths as $path) {
+            $set = array();
+            foreach ($values as $k => $v) {
+                if ($path->hasKey($k, $v)) {
+                    $set[$k] = $v;
+                }
+            }
+
+            if (count($set) == count($values) &&
+                count($set) <= $path->getMaxKeys()) {
+
+                $req = $path->getRequired();
+                if (count(array_intersect(array_keys($set), $req)) != count($req)) {
+                    continue;
+                }
+                $gen = $path->generate($set, $qstring, $anchor);
+                return $this->scriptname.$this->prefix.$gen;
+            }
+        }
+        return false;
+    }
+
+    /**
+    * Returns defined paths
+    * @return array     Array of paths
+    */
+    public function getPaths()
+    {
+        return $this->paths;
+    }
+
+    /**
+    * Reset all paths
+    * This is probably only useful for testing
+    */
+    public function reset()
+    {
+        $this->paths = array();
+        $this->prefix = '';
+    }
+
+    /**
+    * Add a new path to the mapper
+    * @param object     Net_URL_Mapper_Path object
+    */
+    public function addPath(Net_URL_Mapper_Path $path)
+    {
+        $this->paths[$path->getPath()] = $path;
+    }
+
+}
+?>
\ No newline at end of file
diff --git a/extlib/Net/URL/Mapper/Exception.php b/extlib/Net/URL/Mapper/Exception.php
new file mode 100644
index 000000000..ac3ad172b
--- /dev/null
+++ b/extlib/Net/URL/Mapper/Exception.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Exception classes for Net_URL_Mapper
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ * 
+ * Copyright (c) 2006, Bertrand Mansion <golgote@mamasam.com> 
+ * 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   Net
+ * @package    Net_URL_Mapper
+ * @author     Bertrand Mansion <golgote@mamasam.com>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    CVS: $Id: Exception.php,v 1.1 2007/03/28 10:23:04 mansion Exp $
+ * @link       http://pear.php.net/package/Net_URL_Mapper
+ */
+
+/**
+ * Base class for exceptions in PEAR
+ */
+require_once 'PEAR/Exception.php'; 
+
+/**
+ * Base class for exceptions in Net_URL_Mapper package
+ *
+ * Such a base class is required by the Exception RFC:
+ * http://pear.php.net/pepr/pepr-proposal-show.php?id=132
+ * It will rarely be thrown directly, its specialized subclasses will be
+ * thrown most of the time.
+ *
+ * @category   Net
+ * @package    Net_URL_Mapper
+ * @version    Release: @package_version@
+ */
+class Net_URL_Mapper_Exception extends PEAR_Exception
+{
+}
+
+/**
+ * Exception thrown when a path is invalid
+ *
+ * A path can conform to a given structure, but contain invalid parameters.
+ * <code>
+ * $m = Net_URL_Mapper::getInstance();
+ * $m->connect('hi/:name', null, array('name'=>'[a-z]+'));
+ * $m->match('/hi/FOXY'); // Will throw the exception
+ * </code>
+ *
+ * @category   Net
+ * @package    Net_URL_Mapper
+ * @version    Release: @package_version@
+ */
+class Net_URL_Mapper_InvalidException extends Net_URL_Mapper_Exception
+{
+    protected $path;
+    protected $url;
+
+    public function setPath($path)
+    {
+        $this->path = $path;
+    }
+
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    public function setUrl($url)
+    {
+        $this->url = $url;
+    }
+
+    public function getUrl()
+    {
+        return $this->url;
+    }
+} 
+?>
\ No newline at end of file
diff --git a/extlib/Net/URL/Mapper/Part.php b/extlib/Net/URL/Mapper/Part.php
new file mode 100644
index 000000000..2f15b2c16
--- /dev/null
+++ b/extlib/Net/URL/Mapper/Part.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * URL parser and mapper
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ * 
+ * Copyright (c) 2006, Bertrand Mansion <golgote@mamasam.com>
+ * 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   Net
+ * @package    Net_URL_Mapper
+ * @author     Bertrand Mansion <golgote@mamasam.com>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    CVS: $Id: Part.php,v 1.1 2007/03/28 10:23:04 mansion Exp $
+ * @link       http://pear.php.net/package/Net_URL_Mapper
+ */
+
+abstract class Net_URL_Mapper_Part
+{
+    protected $defaults;
+    protected $rule;
+    protected $public;
+    protected $type;
+    protected $required = false;
+    
+    /**
+    * Part name if dynamic or content, generated from path
+    * @var string
+    */
+    public $content;
+    
+    const DYNAMIC = 1;
+    const WILDCARD = 2;
+    const FIXED = 3;
+
+    public function __construct($content, $path)
+    {
+        $this->content = $content;
+        $this->path = $path;
+    }
+
+    public function setRule($rule)
+    {
+        $this->rule = $rule;
+    }
+
+    abstract public function getFormat();
+    
+    abstract public function getRule();
+
+    public function addSlash($str)
+    {
+        $str = trim($str, '/');
+        if (($pos = strpos($this->path, '/')) !== false) {
+            if ($pos == 0) {
+                $str = '/'.$str;
+            } else {
+                $str .= '/';
+            }
+        }
+        return $str;
+    }
+
+    public function addSlashRegex($str)
+    {
+        $str = trim($str, '/');
+        if (($pos = strpos($this->path, '/')) !== false) {
+            if ($pos == 0) {
+                $str = '\/'.$str;
+            } else {
+                $str .= '\/';
+            }
+        }
+        if (!$this->isRequired()) {
+            $str = '('.$str.'|)';
+        }
+        return $str;
+    }
+
+    public function setDefaults($defaults)
+    {
+        $this->defaults = (string)$defaults;
+    }
+
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    public function accept($visitor, $method = null)
+    {
+        $args = func_get_args();
+        $visitor->$method($this, $args);
+    }
+
+    public function setRequired($required)
+    {
+        $this->required = $required;
+    }
+
+    public function isRequired()
+    {
+        return $this->required;
+    }
+
+    abstract public function generate($value = null);
+    
+    public function match($value)
+    {
+        $rule = $this->getRule();
+        return preg_match('/^'.$rule.'$/', $this->addSlash($value));
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/extlib/Net/URL/Mapper/Part/Dynamic.php b/extlib/Net/URL/Mapper/Part/Dynamic.php
new file mode 100644
index 000000000..349d87338
--- /dev/null
+++ b/extlib/Net/URL/Mapper/Part/Dynamic.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * URL parser and mapper
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ * 
+ * Copyright (c) 2006, Bertrand Mansion <golgote@mamasam.com>
+ * 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   Net
+ * @package    Net_URL_Mapper
+ * @author     Bertrand Mansion <golgote@mamasam.com>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    CVS: $Id: Dynamic.php,v 1.1 2007/03/28 10:23:04 mansion Exp $
+ * @link       http://pear.php.net/package/Net_URL_Mapper
+ */
+
+require_once 'Net/URL/Mapper/Part.php';
+
+class Net_URL_Mapper_Part_Dynamic extends Net_URL_Mapper_Part
+{
+    
+    public function __construct($content, $path)
+    {
+        $this->type = Net_URL_Mapper_Part::DYNAMIC;
+        $this->setRequired(true);
+        parent::__construct($content, $path);
+    }
+
+    public function getFormat()
+    {
+        return $this->addSlashRegex('[^\/]+');
+    }
+
+    public function getRule()
+    {
+        if (!empty($this->rule)) {
+            return '(?P<'.$this->content.'>'.$this->addSlashRegex($this->rule).')';
+        }
+        return '(?P<'.$this->content.'>'.$this->addSlashRegex('[^\/]+').')';
+    }
+
+    public function generate($value = null)
+    {
+        if (is_array($value) && isset($value[$this->content])) {
+            $val = $value[$this->content];
+        } elseif (!is_array($value) && !is_null($value)) {
+            $val = $value;
+        } else {
+            $val = $this->defaults;
+        }
+        return $this->addSlash(urlencode($val));
+    }
+}
+?>
\ No newline at end of file
diff --git a/extlib/Net/URL/Mapper/Part/Fixed.php b/extlib/Net/URL/Mapper/Part/Fixed.php
new file mode 100644
index 000000000..b315b442d
--- /dev/null
+++ b/extlib/Net/URL/Mapper/Part/Fixed.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * URL parser and mapper
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ * 
+ * Copyright (c) 2006, Bertrand Mansion <golgote@mamasam.com>
+ * 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   Net
+ * @package    Net_URL_Mapper
+ * @author     Bertrand Mansion <golgote@mamasam.com>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    CVS: $Id: Fixed.php,v 1.1 2007/03/28 10:23:04 mansion Exp $
+ * @link       http://pear.php.net/package/Net_URL_Mapper
+ */
+
+require_once 'Net/URL/Mapper/Part.php';
+
+class Net_URL_Mapper_Part_Fixed extends Net_URL_Mapper_Part
+{
+    
+    public function __construct($content, $path)
+    {
+        $this->type = Net_URL_Mapper_Part::FIXED;
+        parent::__construct($content, $path);
+    }
+
+    public function getFormat()
+    {
+        return $this->getRule();
+    }
+
+    public function getRule()
+    {
+        return preg_quote($this->path, '/');
+    }
+
+    public function generate($value = null)
+    {
+        return $this->path;
+    }
+}
+?>
\ No newline at end of file
diff --git a/extlib/Net/URL/Mapper/Part/Wildcard.php b/extlib/Net/URL/Mapper/Part/Wildcard.php
new file mode 100644
index 000000000..6085ff648
--- /dev/null
+++ b/extlib/Net/URL/Mapper/Part/Wildcard.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * URL parser and mapper
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ * 
+ * Copyright (c) 2006, Bertrand Mansion <golgote@mamasam.com>
+ * 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   Net
+ * @package    Net_URL_Mapper
+ * @author     Bertrand Mansion <golgote@mamasam.com>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    CVS: $Id: Wildcard.php,v 1.1 2007/03/28 10:23:04 mansion Exp $
+ * @link       http://pear.php.net/package/Net_URL_Mapper
+ */
+
+require_once 'Net/URL/Mapper/Part.php';
+
+class Net_URL_Mapper_Part_Wildcard extends Net_URL_Mapper_Part
+{
+    
+    public function __construct($content, $path)
+    {
+        $this->type = Net_URL_Mapper_Part::WILDCARD;
+        $this->setRequired(true);
+        parent::__construct($content, $path);
+    }
+
+    public function getFormat()
+    {
+        return $this->addSlashRegex('.*');;
+    }
+
+    public function getRule()
+    {
+        return '(?P<'.$this->content.'>'.$this->addSlashRegex('.*').')';
+    }
+
+    public function generate($value = null)
+    {
+        if (is_array($value) && isset($value[$this->content])) {
+            $val = $value[$this->content];
+        } elseif (!is_array($value) && !is_null($value)) {
+            $val = $value;
+        } else {
+            $val = $this->defaults;
+        }
+        return $this->addSlash(str_replace(
+            array('%2F', '%23'), 
+            array('/', '#'), urlencode($val)));
+    }
+}
+?>
\ No newline at end of file
diff --git a/extlib/Net/URL/Mapper/Path.php b/extlib/Net/URL/Mapper/Path.php
new file mode 100644
index 000000000..b541002c7
--- /dev/null
+++ b/extlib/Net/URL/Mapper/Path.php
@@ -0,0 +1,430 @@
+<?php
+/**
+ * URL parser and mapper
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ * 
+ * Copyright (c) 2006, Bertrand Mansion <golgote@mamasam.com>
+ * 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   Net
+ * @package    Net_URL_Mapper
+ * @author     Bertrand Mansion <golgote@mamasam.com>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    CVS: $Id: Path.php,v 1.1 2007/03/28 10:23:04 mansion Exp $
+ * @link       http://pear.php.net/package/Net_URL_Mapper
+ */
+
+require_once 'Net/URL.php';
+require_once 'Net/URL/Mapper/Part/Dynamic.php';
+require_once 'Net/URL/Mapper/Part/Wildcard.php';
+require_once 'Net/URL/Mapper/Part/Fixed.php';
+
+class Net_URL_Mapper_Path
+{
+    private $path = '';
+    private $N = 0;
+    public $token;
+    public $value;
+    private $line = 1;
+    private $state = 1;
+
+
+    protected $alias;
+    protected $rules = array();
+    protected $defaults = array();
+    protected $parts = array();
+    protected $rule;
+    protected $format;
+    protected $minKeys;
+    protected $maxKeys;
+    protected $fixed = true;
+    protected $required;
+
+    public function __construct($path = '', $defaults = array(), $rules = array())
+    {
+        $this->path = '/'.trim(Net_URL::resolvePath($path), '/');
+        $this->setDefaults($defaults);
+        $this->setRules($rules);
+
+        try {
+            $this->parsePath();
+        } catch (Exception $e) {
+            // The path could not be parsed correctly, treat it as fixed
+            $this->fixed = true;
+            $part = self::createPart(Net_URL_Mapper_Part::FIXED, $this->path, $this->path);
+            $this->parts = array($part);
+        }
+        $this->getRequired();
+    }
+
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    protected function parsePath()
+    {
+        while ($this->yylex()) { }
+    }
+
+    /**
+    * Get the path alias
+    * Path aliases can be used instead of full path
+    * @return null|string
+    */
+    public function getAlias()
+    {
+        return $this->alias;
+    }
+
+    /**
+    * Set the path name
+    * @param string Set the path name
+    * @see getAlias()
+    */
+    public function setAlias($alias)
+    {
+        $this->alias = $alias;
+        return $this;
+    }
+
+    /**
+    * Get the path parts default values
+    * @return null|array
+    */
+    public function getDefaults()
+    {
+        return $this->defaults;
+    }
+
+    /**
+    * Set the path parts default values
+    * @param array  Associative array with format partname => value
+    */    
+    public function setDefaults($defaults)
+    {
+        if (is_array($defaults)) {
+            $this->defaults = $defaults;
+        } else {
+            $this->defaults = array();
+        }
+    }
+
+    /**
+    * Set the path parts default values
+    * @param array  Associative array with format partname => value
+    */    
+    public function setRules($rules)
+    {
+        if (is_array($rules)) {
+            $this->rules = $rules;   
+        } else {
+            $this->rules = array();
+        }
+    }
+
+    /**
+    * Returns the regular expression used to match this path
+    * @return string  PERL Regular expression
+    */ 
+    public function getRule()
+    {
+        if (is_null($this->rule)) {
+            $this->rule = '/^';
+            foreach ($this->parts as $path => $part) {
+                $this->rule .= $part->getRule();
+            }
+            $this->rule .= '$/';
+        }
+        return $this->rule;
+    }
+
+    public function getFormat()
+    {
+        if (is_null($this->format)) {
+            $this->format = '/^';
+            foreach ($this->parts as $path => $part) {
+                $this->format .= $part->getFormat();
+            }
+            $this->format .= '$/';
+        }
+        return $this->format;
+    }
+
+    protected function addPart($part)
+    {
+        if (array_key_exists($part->content, $this->defaults)) {
+            $part->setRequired(false);
+            $part->setDefaults($this->defaults[$part->content]);
+        }
+        if (isset($this->rules[$part->content])) {
+            $part->setRule($this->rules[$part->content]);
+        }
+        $this->rule = null;
+        if ($part->getType() != Net_URL_Mapper_Part::FIXED) {
+            $this->fixed = false;
+            $this->parts[$part->content] = $part;
+        } else {
+            $this->parts[] = $part;
+        }
+        return $part;
+    }
+
+    public static function createPart($type, $content, $path)
+    {
+        switch ($type) {
+            case Net_URL_Mapper_Part::DYNAMIC:
+                return new Net_URL_Mapper_Part_Dynamic($content, $path);
+                break;
+            case Net_URL_Mapper_Part::WILDCARD:
+                return new Net_URL_Mapper_Part_Wildcard($content, $path);
+                break;
+            default:
+                return new Net_URL_Mapper_Part_Fixed($content, $path);
+        }
+    }
+
+    /**
+    * Checks whether the path contains the given part by name
+    * If value parameter is given, the part also checks if the 
+    * given value conforms to the part rule.
+    * @param string Part name
+    * @param mixed  The value to check against 
+    */
+    public function hasKey($partName, $value = null)
+    {
+        if (array_key_exists($partName, $this->parts)) {
+            if (!is_null($value) && $value !== false) {
+                return $this->parts[$partName]->match($value);
+            } else {
+                return true;
+            }
+        } elseif (array_key_exists($partName, $this->defaults) &&
+            $value == $this->defaults[$partName]) {
+            return true;
+        }
+        return false;
+    }
+
+    public function generate($values = array(), $qstring = array(), $anchor = '')
+    {
+        $path = '';
+        foreach ($this->parts as $part) {
+            $path .= $part->generate($values);
+        }
+        $path = '/'.trim(Net_URL::resolvePath($path), '/');
+        if (!empty($qstring)) {
+            $path .= '?'.http_build_query($qstring);
+        }
+        if (!empty($anchor)) {
+            $path .= '#'.ltrim($anchor, '#');
+        }
+        return $path;
+    }
+
+    public function getRequired()
+    {
+        if (!isset($this->required)) {
+            $req = array();
+            foreach ($this->parts as $part) {
+                if ($part->isRequired()) {
+                    $req[] = $part->content;
+                }
+            }
+            $this->required = $req;
+        }
+        return $this->required;
+    }
+
+    public function getMaxKeys()
+    {
+        if (is_null($this->maxKeys)) {
+            $this->maxKeys = count($this->required);
+            $this->maxKeys += count($this->defaults);
+        }
+        return $this->maxKeys;
+    }
+
+
+
+
+    private $_yy_state = 1;
+    private $_yy_stack = array();
+
+    function yylex()
+    {
+        return $this->{'yylex' . $this->_yy_state}();
+    }
+
+    function yypushstate($state)
+    {
+        array_push($this->_yy_stack, $this->_yy_state);
+        $this->_yy_state = $state;
+    }
+
+    function yypopstate()
+    {
+        $this->_yy_state = array_pop($this->_yy_stack);
+    }
+
+    function yybegin($state)
+    {
+        $this->_yy_state = $state;
+    }
+
+
+
+    function yylex1()
+    {
+        $tokenMap = array (
+              1 => 1,
+              3 => 1,
+              5 => 1,
+              7 => 1,
+              9 => 1,
+            );
+        if ($this->N >= strlen($this->path)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/^(\/?:\/?\\(([a-zA-Z0-9_]+)\\))|^(\/?\\*\/?\\(([a-zA-Z0-9_]+)\\))|^(\/?:([a-zA-Z0-9_]+))|^(\/?\\*([a-zA-Z0-9_]+))|^(\/?([^\/:*]+))/";
+
+        do {
+            if (preg_match($yy_global_pattern, substr($this->path, $this->N), $yymatches)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        'an empty string.  Input "' . substr($this->path,
+                        $this->N, 5) . '... state START');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->N += strlen($this->value);
+                    $this->line += substr_count("\n", $this->value);
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->N += strlen($this->value);
+                    $this->line += substr_count("\n", $this->value);
+                    if ($this->N >= strlen($this->path)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                } else {                    $yy_yymore_patterns = array(
+        1 => "^(\/?\\*\/?\\(([a-zA-Z0-9_]+)\\))|^(\/?:([a-zA-Z0-9_]+))|^(\/?\\*([a-zA-Z0-9_]+))|^(\/?([^\/:*]+))",
+        3 => "^(\/?:([a-zA-Z0-9_]+))|^(\/?\\*([a-zA-Z0-9_]+))|^(\/?([^\/:*]+))",
+        5 => "^(\/?\\*([a-zA-Z0-9_]+))|^(\/?([^\/:*]+))",
+        7 => "^(\/?([^\/:*]+))",
+        9 => "",
+    );
+
+                    // yymore is needed
+                    do {
+                        if (!strlen($yy_yymore_patterns[$this->token])) {
+                            throw new Exception('cannot do yymore for the last token');
+                        }
+                        if (preg_match($yy_yymore_patterns[$this->token],
+                              substr($this->path, $this->N), $yymatches)) {
+                            $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                            next($yymatches); // skip global match
+                            $this->token = key($yymatches); // token number
+                            $this->value = current($yymatches); // token value
+                            $this->line = substr_count("\n", $this->value);
+                        }
+                    } while ($this->{'yy_r1_' . $this->token}() !== null);
+                    // accept
+                    $this->N += strlen($this->value);
+                    $this->line += substr_count("\n", $this->value);
+                    return true;
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->path[$this->N]);
+            }
+            break;
+        } while (true);
+    } // end function
+
+
+    const START = 1;
+    function yy_r1_1($yy_subpatterns)
+    {
+
+    $c = $yy_subpatterns[0];
+    $part = self::createPart(Net_URL_Mapper_Part::DYNAMIC, $c, $this->value);
+    $this->addPart($part);
+    }
+    function yy_r1_3($yy_subpatterns)
+    {
+
+    $c = $yy_subpatterns[0];
+    $part = self::createPart(Net_URL_Mapper_Part::WILDCARD, $c, $this->value);
+    $this->addPart($part);
+    }
+    function yy_r1_5($yy_subpatterns)
+    {
+
+    $c = $yy_subpatterns[0];
+    $part = self::createPart(Net_URL_Mapper_Part::DYNAMIC, $c, $this->value);
+    $this->addPart($part);
+    }
+    function yy_r1_7($yy_subpatterns)
+    {
+
+    $c = $yy_subpatterns[0];
+    $part = self::createPart(Net_URL_Mapper_Part::WILDCARD, $c, $this->value);
+    $this->addPart($part);
+    }
+    function yy_r1_9($yy_subpatterns)
+    {
+
+    $c = $yy_subpatterns[0];
+    $part = self::createPart(Net_URL_Mapper_Part::FIXED, $c, $this->value);
+    $this->addPart($part);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/htaccess.sample b/htaccess.sample
index 5f9827f96..634900dbf 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -4,165 +4,9 @@ RewriteEngine On
 
 RewriteBase /mublog/
 
-RewriteRule ^$ index.php?action=public [L,QSA]
-RewriteRule ^rss$ index.php?action=publicrss [L,QSA]
-RewriteRule ^xrds$ index.php?action=publicxrds [L,QSA]
-RewriteRule ^featuredrss$ index.php?action=featuredrss [L,QSA]
-RewriteRule ^favoritedrss$ index.php?action=favoritedrss [L,QSA]
-RewriteRule ^opensearch/people$ index.php?action=opensearch&type=people [L,QSA]
-RewriteRule ^opensearch/notice$ index.php?action=opensearch&type=notice [L,QSA]
-
-RewriteRule ^doc/about$ index.php?action=doc&title=about [L,QSA]
-RewriteRule ^doc/contact$ index.php?action=doc&title=contact [L,QSA]
-RewriteRule ^doc/faq$ index.php?action=doc&title=faq [L,QSA]
-RewriteRule ^doc/help$ index.php?action=doc&title=help [L,QSA]
-RewriteRule ^doc/im$ index.php?action=doc&title=im [L,QSA]
-RewriteRule ^doc/openid$ index.php?action=doc&title=openid [L,QSA]
-RewriteRule ^doc/openmublog$ index.php?action=doc&title=openmublog [L,QSA]
-RewriteRule ^doc/privacy$ index.php?action=doc&title=privacy [L,QSA]
-RewriteRule ^doc/source$ index.php?action=doc&title=source [L,QSA]
-RewriteRule ^doc/tags$ index.php?action=doc&title=tags [L,QSA]
-RewriteRule ^doc/groups$ index.php?action=doc&title=groups [L,QSA]
-RewriteRule ^doc/sms$ index.php?action=doc&title=sms [L,QSA]
-
-RewriteRule ^facebook/$ index.php?action=facebookhome [L,QSA]
-RewriteRule ^facebook/index.php$ index.php?action=facebookhome [L,QSA]
-RewriteRule ^facebook/settings.php$ index.php?action=facebooksettings [L,QSA]
-RewriteRule ^facebook/invite.php$ index.php?action=facebookinvite [L,QSA]
-RewriteRule ^facebook/remove$ index.php?action=facebookremove [L,QSA]
-
-RewriteRule ^main/login$ index.php?action=login [L,QSA]
-RewriteRule ^main/logout$ index.php?action=logout [L,QSA]
-RewriteRule ^main/register/(.*)$ index.php?action=register&code=$1 [L,QSA]
-RewriteRule ^main/register$ index.php?action=register [L,QSA]
-RewriteRule ^main/openid$ index.php?action=openidlogin [L,QSA]
-RewriteRule ^main/remote$ index.php?action=remotesubscribe [L,QSA]
-
-RewriteRule ^main/subscribe$ index.php?action=subscribe [L,QSA]
-RewriteRule ^main/unsubscribe$ index.php?action=unsubscribe [L,QSA]
-RewriteRule ^main/confirmaddress$ index.php?action=confirmaddress [L,QSA]
-RewriteRule ^main/confirmaddress/(.*)$ index.php?action=confirmaddress&code=$1 [L,QSA]
-RewriteRule ^main/recoverpassword$ index.php?action=recoverpassword [L,QSA]
-RewriteRule ^main/recoverpassword/(.*)$ index.php?action=recoverpassword&code=$1 [L,QSA]
-RewriteRule ^main/invite$ index.php?action=invite [L,QSA]
-
-RewriteRule ^main/favor$ index.php?action=favor [L,QSA]
-RewriteRule ^main/disfavor$ index.php?action=disfavor [L,QSA]
-
-RewriteRule ^main/sup$ index.php?action=sup [L,QSA]
-
-RewriteRule ^main/tagother$ index.php?action=tagother [L,QSA]
-
-RewriteRule ^main/block$ index.php?action=block [L,QSA]
-
-RewriteRule ^settings/profile$ index.php?action=profilesettings [L,QSA]
-RewriteRule ^settings/avatar$ index.php?action=avatarsettings [L,QSA]
-RewriteRule ^settings/password$ index.php?action=passwordsettings [L,QSA]
-RewriteRule ^settings/openid$ index.php?action=openidsettings [L,QSA]
-RewriteRule ^settings/im$ index.php?action=imsettings [L,QSA]
-RewriteRule ^settings/email$ index.php?action=emailsettings [L,QSA]
-RewriteRule ^settings/sms$ index.php?action=smssettings [L,QSA]
-RewriteRule ^settings/twitter$ index.php?action=twittersettings [L,QSA]
-RewriteRule ^settings/other$ index.php?action=othersettings [L,QSA]
-
-RewriteRule ^search/group$ index.php?action=groupsearch [L,QSA]
-RewriteRule ^search/people$ index.php?action=peoplesearch [L,QSA]
-RewriteRule ^search/notice$ index.php?action=noticesearch [L,QSA]
-RewriteRule ^search/notice/rss$ index.php?action=noticesearchrss [L,QSA]
-
-RewriteRule ^notice/new$ index.php?action=newnotice [L,QSA]
-RewriteRule ^notice/(\d+)$ index.php?action=shownotice&notice=$1 [L,QSA]
-RewriteRule ^notice/delete/((\d+))?$ index.php?action=deletenotice&notice=$2 [L,QSA]
-RewriteRule ^notice/delete$ index.php?action=deletenotice [L,QSA]
-
-RewriteRule ^message/new$ index.php?action=newmessage [L,QSA]
-RewriteRule ^message/(\d+)$ index.php?action=showmessage&message=$1 [L,QSA]
-
-RewriteRule ^user/(\d+)$ index.php?action=userbyid&id=$1 [L,QSA]
-
-RewriteRule ^tags/?$ index.php?action=publictagcloud [L,QSA]
-RewriteRule ^tag/([a-zA-Z0-9]+)/rss$ index.php?action=tagrss&tag=$1 [L,QSA]
-RewriteRule ^tag(/(.*))?$ index.php?action=tag&tag=$2 [L,QSA]
-
-RewriteRule ^peopletag/([a-zA-Z0-9]+)$ index.php?action=peopletag&tag=$1 [L,QSA]
-
-RewriteRule ^featured/?$ index.php?action=featured [L,QSA]
-RewriteRule ^favorited/?$ index.php?action=favorited [L,QSA]
-
-RewriteRule ^group/new$ index.php?action=newgroup [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/edit$ index.php?action=editgroup&nickname=$1 [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/join$ index.php?action=joingroup&nickname=$1 [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/leave$ index.php?action=leavegroup&nickname=$1 [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/members$ index.php?action=groupmembers&nickname=$1 [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/logo$ index.php?action=grouplogo&nickname=$1 [L,QSA]
-RewriteRule ^group/([0-9]+)/id$ index.php?action=groupbyid&id=$1 [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/rss$ index.php?action=grouprss&nickname=$1 [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)$ index.php?action=showgroup&nickname=$1 [L,QSA]
-RewriteRule ^group$ index.php?action=groups [L,QSA]
-
-# Twitter-compatible API rewrites
-# XXX: Surely these can be refactored a little -- Zach
-RewriteRule ^api/statuses/public_timeline(.*)$ index.php?action=api&apiaction=statuses&method=public_timeline$1 [L,QSA]
-RewriteRule ^api/statuses/friends_timeline(.*)$ index.php?action=api&apiaction=statuses&method=friends_timeline$1 [L,QSA]
-RewriteRule ^api/statuses/user_timeline/(.*)$ index.php?action=api&apiaction=statuses&method=user_timeline&argument=$1 [L,QSA]
-RewriteRule ^api/statuses/user_timeline(.*)$ index.php?action=api&apiaction=statuses&method=user_timeline$1 [L,QSA]
-RewriteRule ^api/statuses/show/(.*)$ index.php?action=api&apiaction=statuses&method=show&argument=$1 [L,QSA]
-RewriteRule ^api/statuses/update(.*)$ index.php?action=api&apiaction=statuses&method=update$1 [L,QSA]
-RewriteRule ^api/statuses/replies(.*)$ index.php?action=api&apiaction=statuses&method=replies&argument=$1 [L,QSA]
-RewriteRule ^api/statuses/destroy/(.*)$ index.php?action=api&apiaction=statuses&method=destroy&argument=$1 [L,QSA]
-RewriteRule ^api/statuses/friends/(.*)$ index.php?action=api&apiaction=statuses&method=friends&argument=$1 [L,QSA]
-RewriteRule ^api/statuses/friends(.*)$ index.php?action=api&apiaction=statuses&method=friends$1 [L,QSA]
-RewriteRule ^api/statuses/followers/(.*)$ index.php?action=api&apiaction=statuses&method=followers&argument=$1 [L,QSA]
-RewriteRule ^api/statuses/followers(.*)$ index.php?action=api&apiaction=statuses&method=followers$1 [L,QSA]
-RewriteRule ^api/statuses/featured(.*)$ index.php?action=api&apiaction=statuses&method=featured$1 [L,QSA]
-RewriteRule ^api/users/show/(.*)$ index.php?action=api&apiaction=users&method=show&argument=$1 [L,QSA]
-RewriteRule ^api/users/show(.*)$ index.php?action=api&apiaction=users&method=show$1 [L,QSA]
-RewriteRule ^api/direct_messages/sent(.*)$ index.php?action=api&apiaction=direct_messages&method=sent$1 [L,QSA]
-RewriteRule ^api/direct_messages/destroy/(.*)$ index.php?action=api&apiaction=direct_messages&method=destroy&argument=$1 [L,QSA]
-RewriteRule ^api/direct_messages/new(.*)$ index.php?action=api&apiaction=direct_messages&method=create$1 [L,QSA]
-RewriteRule ^api/direct_messages(.*)$ index.php?action=api&apiaction=direct_messages&method=direct_messages$1 [L,QSA]
-RewriteRule ^api/friendships/create/(.*)$ index.php?action=api&apiaction=friendships&method=create&argument=$1 [L,QSA]
-RewriteRule ^api/friendships/destroy/(.*)$ index.php?action=api&apiaction=friendships&method=destroy&argument=$1 [L,QSA]
-RewriteRule ^api/friendships/exists(.*)$ index.php?action=api&apiaction=friendships&method=exists$1 [L,QSA]
-RewriteRule ^api/account/verify_credentials(.*)$ index.php?action=api&apiaction=account&method=verify_credentials$1 [L,QSA]
-RewriteRule ^api/account/end_session$ index.php?action=api&apiaction=account&method=end_session$1 [L,QSA]
-RewriteRule ^api/account/update_location(.*)$ index.php?action=api&apiaction=account&method=update_location$1 [L,QSA]
-RewriteRule ^api/account/update_delivery_device(.*)$ index.php?action=api&apiaction=account&method=update_delivery_device$1 [L,QSA]
-RewriteRule ^api/account/rate_limit_status(.*)$ index.php?action=api&apiaction=account&method=rate_limit_status$1 [L,QSA]
-RewriteRule ^api/favorites/create/(.*)$ index.php?action=api&apiaction=favorites&method=create&argument=$1 [L,QSA]
-RewriteRule ^api/favorites/destroy/(.*)$ index.php?action=api&apiaction=favorites&method=destroy&argument=$1 [L,QSA]
-RewriteRule ^api/favorites/(.*)$ index.php?action=api&apiaction=favorites&method=favorites&argument=$1 [L,QSA]
-RewriteRule ^api/favorites(.*)$ index.php?action=api&apiaction=favorites&method=favorites$1 [L,QSA]
-RewriteRule ^api/notifications/follow/(.*)$ index.php?action=api&apiaction=notifications&method=follow&argument=$1 [L,QSA]
-RewriteRule ^api/notifications/leave/(.*)$ index.php?action=api&apiaction=notifications&method=leave&argument=$1 [L,QSA]
-RewriteRule ^api/blocks/create/(.*)$ index.php?action=api&apiaction=blocks&method=create&argument=$1 [L,QSA]
-RewriteRule ^api/blocks/destroy/(.*)$ index.php?action=api&apiaction=blocks&method=destroy&argument=$1 [L,QSA]
-RewriteRule ^api/help/(.*)$ index.php?action=api&apiaction=help&method=$1 [L,QSA]
-RewriteRule ^api/laconica/version(.*)$ index.php?action=api&apiaction=laconica&method=version$1 [L,QSA]
-RewriteRule ^api/laconica/config(.*)$ index.php?action=api&apiaction=laconica&method=config$1 [L,QSA]
-RewriteRule ^api/laconica/wadl\.xml$ index.php?action=api&apiaction=laconica&method=wadl.xml [L,QSA]
-
-RewriteRule ^(\w+)/subscriptions$ index.php?action=subscriptions&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/subscriptions/([a-zA-Z0-9]+)$ index.php?action=subscriptions&nickname=$1&tag=$2 [L,QSA]
-RewriteRule ^(\w+)/subscribers/([a-zA-Z0-9]+)$ index.php?action=subscribers&nickname=$1&tag=$2 [L,QSA]
-RewriteRule ^(\w+)/subscribers$ index.php?action=subscribers&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/nudge$ index.php?action=nudge&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/xrds$ index.php?action=xrds&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/rss$ index.php?action=userrss&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/all$ index.php?action=all&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/all/rss$ index.php?action=allrss&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/foaf$ index.php?action=foaf&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/replies$ index.php?action=replies&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/replies/rss$ index.php?action=repliesrss&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/avatar/(original|96|48|24)$ index.php?action=avatarbynickname&nickname=$1&size=$2 [L,QSA]
-RewriteRule ^(\w+)/favorites$ index.php?action=showfavorites&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/favorites/rss$ index.php?action=favoritesrss&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/inbox$ index.php?action=inbox&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/outbox$ index.php?action=outbox&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/microsummary$ index.php?action=microsummary&nickname=$1 [L,QSA]
-RewriteRule ^(\w+)/groups$ index.php?action=usergroups&nickname=$1 [L,QSA]
-
-RewriteRule ^(\w+)$ index.php?action=showstream&nickname=$1 [L,QSA]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule (.*) index.php?p=$1 [L,QSA]
 
 <FilesMatch "\.(ini)">
   Order allow,deny
diff --git a/index.php b/index.php
index 387b642e2..dae1ae751 100644
--- a/index.php
+++ b/index.php
@@ -22,53 +22,144 @@ define('LACONICA', true);
 
 require_once INSTALLDIR . '/lib/common.php';
 
-// get and cache current user
+$user = null;
+$action = null;
+
+function getPath($req)
+{
+    if ((common_config('site', 'fancy') || !array_key_exists('PATH_INFO', $_SERVER))
+        && array_key_exists('p', $req)) {
+        return $req['p'];
+    } else if (array_key_exists('PATH_INFO', $_SERVER)) {
+        return $_SERVER['PATH_INFO'];
+    } else {
+        return null;
+    }
+}
 
-$user = common_current_user();
+function handleError($error)
+{
+    if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
+        return;
+    }
 
-// initialize language env
+    $logmsg = "PEAR error: " . $error->getMessage();
+    if(common_config('site', 'logdebug')) {
+        $logmsg .= " : ". $error->getDebugInfo();
+    }
+    common_log(LOG_ERR, $logmsg);
+    $msg = sprintf(_('The database for %s isn\'t responding correctly, '.
+                     'so the site won\'t work properly. '.
+                     'The site admins probably know about the problem, '.
+                     'but you can contact them at %s to make sure. '.
+                     'Otherwise, wait a few minutes and try again.'),
+                   common_config('site', 'name'),
+                   common_config('site', 'email'));
+
+    $dac = new DBErrorAction($msg, 500);
+    $dac->showPage();
+    exit(-1);
+}
 
-common_init_language();
+function main()
+{
+    global $user, $action;
 
-$action = $_REQUEST['action'];
+    if (!_have_config()) {
+        $msg = sprintf(_("No configuration file found. Try running ".
+                         "the installation program first."));
+        $sac = new ServerErrorAction($msg);
+        $sac->showPage();
+        return;
+    }
 
-if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {
-    common_redirect(common_local_url('public'));
-}
+    // For database errors
 
-// If the site is private, and they're not on one of the "public"
-// parts of the site, redirect to login
+    PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
 
-if (!$user && common_config('site', 'private') &&
-    !in_array($action, array('login', 'openidlogin', 'finishopenidlogin',
-                             'recoverpassword', 'api', 'doc', 'register'))) {
-    common_redirect(common_local_url('login'));
-}
+    // XXX: we need a little more structure in this script
 
-$actionfile = INSTALLDIR."/actions/$action.php";
+    // get and cache current user
 
-if (file_exists($actionfile)) {
+    $user = common_current_user();
+
+    // initialize language env
+
+    common_init_language();
+
+    $path = getPath($_REQUEST);
+
+    $r = Router::get();
+
+    $args = $r->map($path);
+
+    if (!$args) {
+        $cac = new ClientErrorAction(_('Unknown page'), 404);
+        $cac->showPage();
+        return;
+    }
 
-    include_once $actionfile;
+    $args = array_merge($args, $_REQUEST);
+
+    $action = $args['action'];
+
+    if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {
+        common_redirect(common_local_url('public'));
+        return;
+    }
+
+    // If the site is private, and they're not on one of the "public"
+    // parts of the site, redirect to login
+
+    if (!$user && common_config('site', 'private') &&
+        !in_array($action, array('login', 'openidlogin', 'finishopenidlogin',
+                                 'recoverpassword', 'api', 'doc', 'register'))) {
+        common_redirect(common_local_url('login'));
+        return;
+    }
 
     $action_class = ucfirst($action).'Action';
 
-    $action_obj = new $action_class();
+    if (!class_exists($action_class)) {
+        $cac = new ClientErrorAction(_('Unknown action'), 404);
+        $cac->showPage();
+    } else {
+        $action_obj = new $action_class();
+
+        // XXX: find somewhere for this little block to live
 
-    if ($config['db']['mirror'] && $action_obj->isReadOnly()) {
-        if (is_array($config['db']['mirror'])) {
-            // "load balancing", ha ha
-            $k = array_rand($config['db']['mirror']);
+        if (common_config('db', 'mirror') && $action_obj->isReadOnly()) {
+            if (is_array(common_config('db', 'mirror'))) {
+                // "load balancing", ha ha
+                $k = array_rand($config['db']['mirror']);
 
-            $mirror = $config['db']['mirror'][$k];
-        } else {
-            $mirror = $config['db']['mirror'];
+                $mirror = $config['db']['mirror'][$k];
+            } else {
+                $mirror = $config['db']['mirror'];
+            }
+            $config['db']['database'] = $mirror;
+        }
+
+        try {
+            if ($action_obj->prepare($args)) {
+                $action_obj->handle($args);
+            }
+        } catch (ClientException $cex) {
+            $cac = new ClientErrorAction($cex->getMessage(), $cex->getCode());
+            $cac->showPage();
+        } catch (ServerException $sex) { // snort snort guffaw
+            $sac = new ServerErrorAction($sex->getMessage(), $sex->getCode());
+            $sac->showPage();
+        } catch (Exception $ex) {
+            $sac = new ServerErrorAction($ex->getMessage());
+            $sac->showPage();
         }
-        $config['db']['database'] = $mirror;
-    }
-    if (call_user_func(array($action_obj, 'prepare'), $_REQUEST)) {
-        call_user_func(array($action_obj, 'handle'), $_REQUEST);
     }
-} else {
-    common_user_error(_('Unknown action'));
-}
\ No newline at end of file
+}
+
+main();
+
+// XXX: cleanup exit() calls or add an exit handler so
+// this always gets called
+
+Event::handle('CleanupPlugin');
diff --git a/install.php b/install.php
new file mode 100644
index 000000000..0240349bb
--- /dev/null
+++ b/install.php
@@ -0,0 +1,255 @@
+<?
+define('INSTALLDIR', dirname(__FILE__));
+
+function main()
+{
+    if (!checkPrereqs())
+    {
+        return;
+    }
+
+    if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+        handlePost();
+    } else {
+        showForm();
+    }
+}
+
+function checkPrereqs()
+{
+    if (file_exists(INSTALLDIR.'/config.php')) {
+         ?><p class="error">Config file &quot;config.php&quot; already exists.</p>
+         <?
+        return false;
+    }
+
+    if (version_compare(PHP_VERSION, '5.0.0', '<')) {
+            ?><p class="error">Require PHP version 5 or greater.</p><?
+		    return false;
+    }
+
+    $reqs = array('gd', 'mysql', 'curl',
+                  'xmlwriter', 'mbstring',
+                  'gettext');
+
+    foreach ($reqs as $req) {
+        if (!checkExtension($req)) {
+            ?><p class="error">Cannot load required extension &quot;<?= $req ?>&quot;.</p><?
+		    return false;
+        }
+    }
+
+	if (!is_writable(INSTALLDIR)) {
+         ?><p class="error">Cannot write config file to &quot;<?= INSTALLDIR ?>&quot;.</p>
+	       <p>On your server, try this command:</p>
+	       <blockquote>chmod a+w <?= INSTALLDIR ?></blockquote>
+         <?
+	     return false;
+	}
+
+	if (!is_writable(INSTALLDIR.'/avatar/')) {
+         ?><p class="error">Cannot write avatar directory &quot;<?= INSTALLDIR ?>/avatar/&quot;.</p>
+	       <p>On your server, try this command:</p>
+	       <blockquote>chmod a+w <?= INSTALLDIR ?>/avatar/</blockquote>
+         <?
+	     return false;
+	}
+
+	return true;
+}
+
+function checkExtension($name)
+{
+    if (!extension_loaded($name)) {
+        if (!dl($name.'.so')) {
+            return false;
+        }
+    }
+    return true;
+}
+
+function showForm()
+{
+?>
+<p>Enter your database connection information below to initialize the database.</p>
+<form method='post' action='install.php'>
+	<fieldset>
+	<ul class='form_data'>
+	<li>
+	<label for='sitename'>Site name</label>
+	<input type='text' id='sitename' name='sitename' />
+	<p>The name of your site</p>
+	</li>
+	<li>
+	<li>
+	<label for='host'>Hostname</label>
+	<input type='text' id='host' name='host' />
+	<p>Database hostname</p>
+	</li>
+	<li>
+	<label for='host'>Database</label>
+	<input type='text' id='database' name='database' />
+	<p>Database name</p>
+	</li>
+	<li>
+	<label for='username'>Username</label>
+	<input type='text' id='username' name='username' />
+	<p>Database username</p>
+	</li>
+	<li>
+	<label for='password'>Password</label>
+	<input type='password' id='password' name='password' />
+	<p>Database password</p>
+	</li>
+	</ul>
+	<input type='submit' name='submit' value='Submit'>
+	</fieldset>
+</form>
+<?
+}
+
+function updateStatus($status, $error=false)
+{
+?>
+	<li>
+<?
+    print $status;
+?>
+	</li>
+<?
+}
+
+function handlePost()
+{
+?>
+	<ul>
+<?
+    $host = $_POST['host'];
+    $database = $_POST['database'];
+    $username = $_POST['username'];
+    $password = $_POST['password'];
+    $sitename = $_POST['sitename'];
+
+    if (empty($host)) {
+        updateStatus("No hostname specified.", true);
+        showForm();
+        return;
+    }
+
+    if (empty($database)) {
+        updateStatus("No database specified.", true);
+        showForm();
+        return;
+    }
+
+    if (empty($username)) {
+        updateStatus("No username specified.", true);
+        showForm();
+        return;
+    }
+
+    if (empty($password)) {
+        updateStatus("No password specified.", true);
+        showForm();
+        return;
+    }
+
+    if (empty($sitename)) {
+        updateStatus("No sitename specified.", true);
+        showForm();
+        return;
+    }
+
+    updateStatus("Starting installation...");
+    updateStatus("Checking database...");
+    $conn = mysql_connect($host, $username, $password);
+    if (!$conn) {
+        updateStatus("Can't connect to server '$host' as '$username'.", true);
+        showForm();
+        return;
+    }
+    updateStatus("Changing to database...");
+    $res = mysql_select_db($database, $conn);
+    if (!$res) {
+        updateStatus("Can't change to database.", true);
+        showForm();
+        return;
+    }
+    updateStatus("Running database script...");
+    $res = runDbScript(INSTALLDIR.'/db/laconica.sql', $conn);
+    if ($res === false) {
+        updateStatus("Can't run database script.", true);
+        showForm();
+        return;
+    }
+    foreach (array('sms_carrier' => 'SMS carrier',
+                   'notice_source' => 'notice source',
+                   'foreign_services' => 'foreign service')
+             as $scr => $name) {
+        updateStatus(sprintf("Adding %s data to database...", $name));
+        $res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn);
+        if ($res === false) {
+            updateStatus(sprintf("Can't run %d script.", $name), true);
+            showForm();
+            return;
+        }
+    }
+    updateStatus("Writing config file...");
+    $sqlUrl = "mysqli://$username:$password@$host/$database";
+    $res = writeConf($sitename, $sqlUrl);
+    if (!$res) {
+        updateStatus("Can't write config file.", true);
+        showForm();
+        return;
+    }
+    updateStatus("Done!");
+?>
+	</ul>
+<?
+}
+
+function writeConf($sitename, $sqlUrl)
+{
+    $res = file_put_contents(INSTALLDIR.'/config.php',
+                             "<?\n".
+                             "\$config['site']['name'] = \"$sitename\";\n\n".
+                             "\$config['db']['database'] = \"$sqlUrl\";\n\n");
+    return $res;
+}
+
+function runDbScript($filename, $conn)
+{
+    $sql = trim(file_get_contents($filename));
+    $stmts = explode(';', $sql);
+    foreach ($stmts as $stmt) {
+        $stmt = trim($stmt);
+        if (!mb_strlen($stmt)) {
+            continue;
+        }
+        $res = mysql_query($stmt, $conn);
+        if ($res === false) {
+            return $res;
+        }
+    }
+    return true;
+}
+
+?>
+<html>
+<head>
+	<title>Install Laconica</title>
+	<link rel="stylesheet" type="text/css" href="theme/base/css/display.css?version=0.7.1" media="screen, projection, tv"/>
+	<link rel="stylesheet" type="text/css" href="theme/base/css/modal.css?version=0.7.1" media="screen, projection, tv"/>
+	<link rel="stylesheet" type="text/css" href="theme/default/css/display.css?version=0.7.1" media="screen, projection, tv"/>
+</head>
+<body>
+	<div id="wrap">
+	<div id="core">
+	<div id="content">
+	<h1>Install Laconica</h1>
+<? main() ?>
+	</div>
+	</div>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/js/facebookapp.js b/js/facebookapp.js
index c7e8d6aa2..f0696c19e 100644
--- a/js/facebookapp.js
+++ b/js/facebookapp.js
@@ -1,18 +1,33 @@
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
\ No newline at end of file
+* Laconica - a distributed open-source microblogging tool
+* Copyright (C) 2008, Controlez-Vous, Inc.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+var max = 140;
+var noticeBox = document.getElementById('notice_data-text'); 
+
+if (noticeBox) {
+    noticeBox.addEventListener('keyup', keypress);
+    noticeBox.addEventListener('keydown', keypress);
+    noticeBox.addEventListener('keypress', keypress);
+    noticeBox.addEventListener('change', keypress);
+}
+
+// Do our the countdown
+function keypress(evt) {  
+    document.getElementById('notice_text-count').setTextValue(
+        max - noticeBox.getValue().length);      
+}
diff --git a/js/flowplayer-3.0.5.min.js b/js/flowplayer-3.0.5.min.js
new file mode 100644
index 000000000..b1c33150a
--- /dev/null
+++ b/js/flowplayer-3.0.5.min.js
@@ -0,0 +1,24 @@
+/** 
+ * flowplayer.js 3.0.5. The Flowplayer API
+ * 
+ * Copyright 2009 Flowplayer Oy
+ * 
+ * This file is part of Flowplayer.
+ * 
+ * Flowplayer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Flowplayer 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 General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Flowplayer.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Version: 3.0.5 - Tue Feb 03 2009 13:14:17 GMT-0000 (GMT+00:00)
+ */
+(function(){function log(args){console.log("$f.fireEvent",[].slice.call(args));}function clone(obj){if(!obj||typeof obj!='object'){return obj;}var temp=new obj.constructor();for(var key in obj){if(obj.hasOwnProperty(key)){temp[key]=clone(obj[key]);}}return temp;}function each(obj,fn){if(!obj){return;}var name,i=0,length=obj.length;if(length===undefined){for(name in obj){if(fn.call(obj[name],name,obj[name])===false){break;}}}else{for(var value=obj[0];i<length&&fn.call(value,i,value)!==false;value=obj[++i]){}}return obj;}function el(id){return document.getElementById(id);}function extend(to,from,skipFuncs){if(to&&from){each(from,function(name,value){if(!skipFuncs||typeof value!='function'){to[name]=value;}});}}function select(query){var index=query.indexOf(".");if(index!=-1){var tag=query.substring(0,index)||"*";var klass=query.substring(index+1,query.length);var els=[];each(document.getElementsByTagName(tag),function(){if(this.className&&this.className.indexOf(klass)!=-1){els.push(this);}});return els;}}function stopEvent(e){e=e||window.event;if(e.preventDefault){e.stopPropagation();e.preventDefault();}else{e.returnValue=false;e.cancelBubble=true;}return false;}function bind(to,evt,fn){to[evt]=to[evt]||[];to[evt].push(fn);}function makeId(){return"_"+(""+Math.random()).substring(2,10);}var Clip=function(json,index,player){var self=this;var cuepoints={};var listeners={};self.index=index;if(typeof json=='string'){json={url:json};}extend(this,json,true);each(("Begin*,Start,Pause*,Resume*,Seek*,Stop*,Finish*,LastSecond,Update,BufferFull,BufferEmpty,BufferStop").split(","),function(){var evt="on"+this;if(evt.indexOf("*")!=-1){evt=evt.substring(0,evt.length-1);var before="onBefore"+evt.substring(2);self[before]=function(fn){bind(listeners,before,fn);return self;};}self[evt]=function(fn){bind(listeners,evt,fn);return self;};if(index==-1){if(self[before]){player[before]=self[before];}if(self[evt]){player[evt]=self[evt];}}});extend(this,{onCuepoint:function(points,fn){if(arguments.length==1){cuepoints.embedded=[null,points];return self;}if(typeof points=='number'){points=[points];}var fnId=makeId();cuepoints[fnId]=[points,fn];if(player.isLoaded()){player._api().fp_addCuepoints(points,index,fnId);}return self;},update:function(json){extend(self,json);if(player.isLoaded()){player._api().fp_updateClip(json,index);}var conf=player.getConfig();var clip=(index==-1)?conf.clip:conf.playlist[index];extend(clip,json,true);},_fireEvent:function(evt,arg1,arg2,target){if(evt=='onLoad'){each(cuepoints,function(key,val){if(val[0]){player._api().fp_addCuepoints(val[0],index,key);}});return false;}target=target||self;if(evt=='onCuepoint'){var fn=cuepoints[arg1];if(fn){return fn[1].call(player,target,arg2);}}if(evt=='onStart'||evt=='onUpdate'){extend(target,arg1);if(!target.duration){target.duration=arg1.metaData.duration;}else{target.fullDuration=arg1.metaData.duration;}}var ret=true;each(listeners[evt],function(){ret=this.call(player,target,arg1,arg2);});return ret;}});if(json.onCuepoint){var arg=json.onCuepoint;self.onCuepoint.apply(self,typeof arg=='function'?[arg]:arg);delete json.onCuepoint;}each(json,function(key,val){if(typeof val=='function'){bind(listeners,key,val);delete json[key];}});if(index==-1){player.onCuepoint=this.onCuepoint;}};var Plugin=function(name,json,player,fn){var listeners={};var self=this;var hasMethods=false;if(fn){extend(listeners,fn);}each(json,function(key,val){if(typeof val=='function'){listeners[key]=val;delete json[key];}});extend(this,{animate:function(props,speed,fn){if(!props){return self;}if(typeof speed=='function'){fn=speed;speed=500;}if(typeof props=='string'){var key=props;props={};props[key]=speed;speed=500;}if(fn){var fnId=makeId();listeners[fnId]=fn;}if(speed===undefined){speed=500;}json=player._api().fp_animate(name,props,speed,fnId);return self;},css:function(props,val){if(val!==undefined){var css={};css[props]=val;props=css;}json=player._api().fp_css(name,props);extend(self,json);return self;},show:function(){this.display='block';player._api().fp_showPlugin(name);return self;},hide:function(){this.display='none';player._api().fp_hidePlugin(name);return self;},toggle:function(){this.display=player._api().fp_togglePlugin(name);return self;},fadeTo:function(o,speed,fn){if(typeof speed=='function'){fn=speed;speed=500;}if(fn){var fnId=makeId();listeners[fnId]=fn;}this.display=player._api().fp_fadeTo(name,o,speed,fnId);this.opacity=o;return self;},fadeIn:function(speed,fn){return self.fadeTo(1,speed,fn);},fadeOut:function(speed,fn){return self.fadeTo(0,speed,fn);},getName:function(){return name;},_fireEvent:function(evt,arg){if(evt=='onUpdate'){var json=player._api().fp_getPlugin(name);if(!json){return;}extend(self,json);delete self.methods;if(!hasMethods){each(json.methods,function(){var method=""+this;self[method]=function(){var a=[].slice.call(arguments);var ret=player._api().fp_invoke(name,method,a);return ret=='undefined'?self:ret;};});hasMethods=true;}}var fn=listeners[evt];if(fn){fn.call(self,arg);if(evt.substring(0,1)=="_"){delete listeners[evt];}}}});};function Player(wrapper,params,conf){var
+self=this,api=null,html,commonClip,playlist=[],plugins={},listeners={},playerId,apiId,playerIndex,activeIndex,swfHeight,wrapperHeight;extend(self,{id:function(){return playerId;},isLoaded:function(){return(api!==null);},getParent:function(){return wrapper;},hide:function(all){if(all){wrapper.style.height="0px";}if(api){api.style.height="0px";}return self;},show:function(){wrapper.style.height=wrapperHeight+"px";if(api){api.style.height=swfHeight+"px";}return self;},isHidden:function(){return api&&parseInt(api.style.height,10)===0;},load:function(fn){if(!api&&self._fireEvent("onBeforeLoad")!==false){each(players,function(){this.unload();});html=wrapper.innerHTML;flashembed(wrapper,params,{config:conf});if(fn){fn.cached=true;bind(listeners,"onLoad",fn);}}return self;},unload:function(){try{if(api&&api.fp_isFullscreen()){}}catch(error){return;}if(api&&html.replace(/\s/g,'')!==''&&!api.fp_isFullscreen()&&self._fireEvent("onBeforeUnload")!==false){api.fp_close();wrapper.innerHTML=html;self._fireEvent("onUnload");api=null;}return self;},getClip:function(index){if(index===undefined){index=activeIndex;}return playlist[index];},getCommonClip:function(){return commonClip;},getPlaylist:function(){return playlist;},getPlugin:function(name){var plugin=plugins[name];if(!plugin&&self.isLoaded()){var json=self._api().fp_getPlugin(name);if(json){plugin=new Plugin(name,json,self);plugins[name]=plugin;}}return plugin;},getScreen:function(){return self.getPlugin("screen");},getControls:function(){return self.getPlugin("controls");},getConfig:function(copy){return copy?clone(conf):conf;},getFlashParams:function(){return params;},loadPlugin:function(name,url,props,fn){if(typeof props=='function'){fn=props;props={};}var fnId=fn?makeId():"_";self._api().fp_loadPlugin(name,url,props,fnId);var arg={};arg[fnId]=fn;var p=new Plugin(name,null,self,arg);plugins[name]=p;return p;},getState:function(){return api?api.fp_getState():-1;},play:function(clip){function play(){if(clip!==undefined){self._api().fp_play(clip);}else{self._api().fp_play();}}if(api){play();}else{self.load(function(){play();});}return self;},getVersion:function(){var js="flowplayer.js 3.0.5";if(api){var ver=api.fp_getVersion();ver.push(js);return ver;}return js;},_api:function(){if(!api){throw"Flowplayer "+self.id()+" not loaded. Try moving your call to player's onLoad event";}return api;},_dump:function(){console.log(listeners);},setClip:function(clip){self.setPlaylist([clip]);},getIndex:function(){return playerIndex;}});each(("Click*,Load*,Unload*,Keypress*,Volume*,Mute*,Unmute*,PlaylistReplace,Fullscreen*,FullscreenExit,Error").split(","),function(){var name="on"+this;if(name.indexOf("*")!=-1){name=name.substring(0,name.length-1);var name2="onBefore"+name.substring(2);self[name2]=function(fn){bind(listeners,name2,fn);return self;};}self[name]=function(fn){bind(listeners,name,fn);return self;};});each(("pause,resume,mute,unmute,stop,toggle,seek,getStatus,getVolume,setVolume,getTime,isPaused,isPlaying,startBuffering,stopBuffering,isFullscreen,reset,close,setPlaylist").split(","),function(){var name=this;self[name]=function(arg){if(!api){return self;}var ret=(arg===undefined)?api["fp_"+name]():api["fp_"+name](arg);return ret=='undefined'?self:ret;};});self._fireEvent=function(evt,arg0,arg1,arg2){if(conf.debug){log(arguments);}if(!api&&evt=='onLoad'&&arg0=='player'){api=api||el(apiId);swfHeight=api.clientHeight;each(playlist,function(){this._fireEvent("onLoad");});each(plugins,function(name,p){p._fireEvent("onUpdate");});commonClip._fireEvent("onLoad");}if(evt=='onLoad'&&arg0!='player'){return;}if(evt=='onError'){if(typeof arg0=='string'||(typeof arg0=='number'&&typeof arg1=='number')){arg0=arg1;arg1=arg2;}}if(evt=='onContextMenu'){each(conf.contextMenu[arg0],function(key,fn){fn.call(self);});return;}if(evt=='onPluginEvent'){var name=arg0.name||arg0;var p=plugins[name];if(p){p._fireEvent("onUpdate",arg0);p._fireEvent(arg1);}return;}if(evt=='onPlaylistReplace'){playlist=[];var index=0;each(arg0,function(){playlist.push(new Clip(this,index++,self));});}var ret=true;if(typeof arg0=='number'&&arg0<playlist.length){activeIndex=arg0;var clip=playlist[arg0];if(clip){ret=clip._fireEvent(evt,arg1,arg2);}if(!clip||ret!==false){ret=commonClip._fireEvent(evt,arg1,arg2,clip);}}var i=0;each(listeners[evt],function(){ret=this.call(self,arg0,arg1);if(this.cached){listeners[evt].splice(i,1);}if(ret===false){return false;}i++;});return ret;};function init(){if($f(wrapper)){$f(wrapper).getParent().innerHTML="";playerIndex=$f(wrapper).getIndex();players[playerIndex]=self;}else{players.push(self);playerIndex=players.length-1;}wrapperHeight=parseInt(wrapper.style.height,10)||wrapper.clientHeight;if(typeof params=='string'){params={src:params};}playerId=wrapper.id||"fp"+makeId();apiId=params.id||playerId+"_api";params.id=apiId;conf.playerId=playerId;if(typeof conf=='string'){conf={clip:{url:conf}};}if(typeof conf.clip=='string'){conf.clip={url:conf.clip};}conf.clip=conf.clip||{};if(wrapper.getAttribute("href",2)&&!conf.clip.url){conf.clip.url=wrapper.getAttribute("href",2);}commonClip=new Clip(conf.clip,-1,self);conf.playlist=conf.playlist||[conf.clip];var index=0;each(conf.playlist,function(){var clip=this;if(typeof clip=='object'&&clip.length){clip=""+clip;}if(typeof clip=='string'){clip={url:clip};}each(conf.clip,function(key,val){if(conf.clip[key]!==undefined&&typeof val!='function'){clip[key]=val;}});conf.playlist[index]=clip;clip=new Clip(clip,index,self);playlist.push(clip);index++;});each(conf,function(key,val){if(typeof val=='function'){bind(listeners,key,val);delete conf[key];}});each(conf.plugins,function(name,val){if(val){plugins[name]=new Plugin(name,val,self);}});if(!conf.plugins||conf.plugins.controls===undefined){plugins.controls=new Plugin("controls",null,self);}params.bgcolor=params.bgcolor||"#000000";params.version=params.version||[9,0];params.expressInstall='http://www.flowplayer.org/swf/expressinstall.swf';function doClick(e){if(!self.isLoaded()&&self._fireEvent("onBeforeClick")!==false){self.load();}return stopEvent(e);}html=wrapper.innerHTML;if(html.replace(/\s/g,'')!==''){if(wrapper.addEventListener){wrapper.addEventListener("click",doClick,false);}else if(wrapper.attachEvent){wrapper.attachEvent("onclick",doClick);}}else{if(wrapper.addEventListener){wrapper.addEventListener("click",stopEvent,false);}self.load();}}if(typeof wrapper=='string'){flashembed.domReady(function(){var node=el(wrapper);if(!node){throw"Flowplayer cannot access element: "+wrapper;}else{wrapper=node;init();}});}else{init();}}var players=[];function Iterator(arr){this.length=arr.length;this.each=function(fn){each(arr,fn);};this.size=function(){return arr.length;};}window.flowplayer=window.$f=function(){var instance=null;var arg=arguments[0];if(!arguments.length){each(players,function(){if(this.isLoaded()){instance=this;return false;}});return instance||players[0];}if(arguments.length==1){if(typeof arg=='number'){return players[arg];}else{if(arg=='*'){return new Iterator(players);}each(players,function(){if(this.id()==arg.id||this.id()==arg||this.getParent()==arg){instance=this;return false;}});return instance;}}if(arguments.length>1){var swf=arguments[1];var conf=(arguments.length==3)?arguments[2]:{};if(typeof arg=='string'){if(arg.indexOf(".")!=-1){var instances=[];each(select(arg),function(){instances.push(new Player(this,clone(swf),clone(conf)));});return new Iterator(instances);}else{var node=el(arg);return new Player(node!==null?node:arg,swf,conf);}}else if(arg){return new Player(arg,swf,conf);}}return null;};extend(window.$f,{fireEvent:function(id,evt,a0,a1,a2){var p=$f(id);return p?p._fireEvent(evt,a0,a1,a2):null;},addPlugin:function(name,fn){Player.prototype[name]=fn;return $f;},each:each,extend:extend});if(document.all){window.onbeforeunload=function(){$f("*").each(function(){if(this.isLoaded()){this.close();}});};}if(typeof jQuery=='function'){jQuery.prototype.flowplayer=function(params,conf){if(!arguments.length||typeof arguments[0]=='number'){var arr=[];this.each(function(){var p=$f(this);if(p){arr.push(p);}});return arguments.length?arr[arguments[0]]:new Iterator(arr);}return this.each(function(){$f(this,clone(params),conf?clone(conf):{});});};}})();(function(){var jQ=typeof jQuery=='function';function isDomReady(){if(domReady.done){return false;}var d=document;if(d&&d.getElementsByTagName&&d.getElementById&&d.body){clearInterval(domReady.timer);domReady.timer=null;for(var i=0;i<domReady.ready.length;i++){domReady.ready[i].call();}domReady.ready=null;domReady.done=true;}}var domReady=jQ?jQuery:function(f){if(domReady.done){return f();}if(domReady.timer){domReady.ready.push(f);}else{domReady.ready=[f];domReady.timer=setInterval(isDomReady,13);}};function extend(to,from){if(from){for(key in from){if(from.hasOwnProperty(key)){to[key]=from[key];}}}return to;}function asString(obj){switch(typeOf(obj)){case'string':obj=obj.replace(new RegExp('(["\\\\])','g'),'\\$1');obj=obj.replace(/^\s?(\d+)%/,"$1pct");return'"'+obj+'"';case'array':return'['+map(obj,function(el){return asString(el);}).join(',')+']';case'function':return'"function()"';case'object':var str=[];for(var prop in obj){if(obj.hasOwnProperty(prop)){str.push('"'+prop+'":'+asString(obj[prop]));}}return'{'+str.join(',')+'}';}return String(obj).replace(/\s/g," ").replace(/\'/g,"\"");}function typeOf(obj){if(obj===null||obj===undefined){return false;}var type=typeof obj;return(type=='object'&&obj.push)?'array':type;}if(window.attachEvent){window.attachEvent("onbeforeunload",function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){};});}function map(arr,func){var newArr=[];for(var i in arr){if(arr.hasOwnProperty(i)){newArr[i]=func(arr[i]);}}return newArr;}function getHTML(p,c){var ie=document.all;var html='<object width="'+p.width+'" height="'+p.height+'"';if(ie&&!p.id){p.id="_"+(""+Math.random()).substring(9);}if(p.id){html+=' id="'+p.id+'"';}if(p.w3c||!ie){html+=' data="'+p.src+'" type="application/x-shockwave-flash"';}else{html+=' classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"';}html+='>';if(p.w3c||ie){html+='<param name="movie" value="'+p.src+'" />';}var e=extend({},p);e.width=e.height=e.id=e.w3c=e.src=null;for(var k in e){if(e[k]!==null){html+='<param name="'+k+'" value="'+e[k]+'" />';}}var vars="";if(c){for(var key in c){if(c[key]!==null){vars+=key+'='+(typeof c[key]=='object'?asString(c[key]):c[key])+'&';}}vars=vars.substring(0,vars.length-1);html+='<param name="flashvars" value=\''+vars+'\' />';}html+="</object>";return html;}function Flash(root,opts,flashvars){var version=flashembed.getVersion();extend(this,{getContainer:function(){return root;},getConf:function(){return conf;},getVersion:function(){return version;},getFlashvars:function(){return flashvars;},getApi:function(){return root.firstChild;},getHTML:function(){return getHTML(opts,flashvars);}});var required=opts.version;var express=opts.expressInstall;var ok=!required||flashembed.isSupported(required);if(ok){opts.onFail=opts.version=opts.expressInstall=null;root.innerHTML=getHTML(opts,flashvars);}else if(required&&express&&flashembed.isSupported([6,65])){extend(opts,{src:express});flashvars={MMredirectURL:location.href,MMplayerType:'PlugIn',MMdoctitle:document.title};root.innerHTML=getHTML(opts,flashvars);}else{if(root.innerHTML.replace(/\s/g,'')!==''){}else{root.innerHTML="<h2>Flash version "+required+" or greater is required</h2>"+"<h3>"+(version[0]>0?"Your version is "+version:"You have no flash plugin installed")+"</h3>"+"<p>Download latest version from <a href='http://www.adobe.com/go/getflashplayer'>here</a></p>";}}if(!ok&&opts.onFail){var ret=opts.onFail.call(this);if(typeof ret=='string'){root.innerHTML=ret;}}}window.flashembed=function(root,conf,flashvars){if(typeof root=='string'){var el=document.getElementById(root);if(el){root=el;}else{domReady(function(){flashembed(root,conf,flashvars);});return;}}if(!root){return;}var opts={width:'100%',height:'100%',allowfullscreen:true,allowscriptaccess:'always',quality:'high',version:null,onFail:null,expressInstall:null,w3c:false};if(typeof conf=='string'){conf={src:conf};}extend(opts,conf);return new Flash(root,opts,flashvars);};extend(window.flashembed,{getVersion:function(){var version=[0,0];if(navigator.plugins&&typeof navigator.plugins["Shockwave Flash"]=="object"){var _d=navigator.plugins["Shockwave Flash"].description;if(typeof _d!="undefined"){_d=_d.replace(/^.*\s+(\S+\s+\S+$)/,"$1");var _m=parseInt(_d.replace(/^(.*)\..*$/,"$1"),10);var _r=/r/.test(_d)?parseInt(_d.replace(/^.*r(.*)$/,"$1"),10):0;version=[_m,_r];}}else if(window.ActiveXObject){try{var _a=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");}catch(e){try{_a=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");version=[6,0];_a.AllowScriptAccess="always";}catch(ee){if(version[0]==6){return;}}try{_a=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");}catch(eee){}}if(typeof _a=="object"){_d=_a.GetVariable("$version");if(typeof _d!="undefined"){_d=_d.replace(/^\S+\s+(.*)$/,"$1").split(",");version=[parseInt(_d[0],10),parseInt(_d[2],10)];}}}return version;},isSupported:function(version){var now=flashembed.getVersion();var ret=(now[0]>version[0])||(now[0]==version[0]&&now[1]>=version[1]);return ret;},domReady:domReady,asString:asString,getHTML:getHTML});if(jQ){jQuery.prototype.flashembed=function(conf,flashvars){return this.each(function(){flashembed(this,conf,flashvars);});};}})();
\ No newline at end of file
diff --git a/js/identica-badge.js b/js/identica-badge.js
index 5c586b5d6..869230b7a 100644
--- a/js/identica-badge.js
+++ b/js/identica-badge.js
@@ -1,4 +1,5 @@
 // identica badge -- updated to work with the native API, 12-4-2008
+// Modified to point to Identi.ca, 2-20-2009 by Zach
 // copyright Kent Brewster 2008
 // see http://kentbrewster.com/identica-badge for info
 ( function() { 
@@ -127,7 +128,7 @@
             var a = document.createElement('A');
             a.innerHTML = 'get this';
             a.target = '_blank';
-            a.href = 'http://kentbrewster.com/identica-badge';
+            a.href = 'http://identica/doc/badge';
             $.s.f.appendChild(a);
             $.s.appendChild($.s.f);
             $.f.getUser();
diff --git a/js/jcrop/jquery.Jcrop.go.js b/js/jcrop/jquery.Jcrop.go.js
index b2737407b..a0399d540 100644
--- a/js/jcrop/jquery.Jcrop.go.js
+++ b/js/jcrop/jquery.Jcrop.go.js
@@ -37,10 +37,3 @@
 			$('#avatar_crop_w').val(c.w);
 			$('#avatar_crop_h').val(c.h);
 		};
-
-		function checkCoords() {
-			if (parseInt($('#avatar_crop_w').val())) return true;
-			alert('Please select a crop region then press submit.');
-			return false;
-		};
-
diff --git a/js/jquery.js b/js/jquery.js
index fc06ace27..94e9c1755 100644
--- a/js/jquery.js
+++ b/js/jquery.js
@@ -1,13 +1,13 @@
 /*!
- * jQuery JavaScript Library v1.3
+ * jQuery JavaScript Library v1.3.1
  * http://jquery.com/
  *
  * Copyright (c) 2009 John Resig
  * Dual licensed under the MIT and GPL licenses.
  * http://docs.jquery.com/License
  *
- * Date: 2009-01-13 12:50:31 -0500 (Tue, 13 Jan 2009)
- * Revision: 6104
+ * Date: 2009-01-21 20:42:16 -0500 (Wed, 21 Jan 2009)
+ * Revision: 6158
  */
 (function(){
 
@@ -60,20 +60,16 @@ jQuery.fn = jQuery.prototype = {
 				else {
 					var elem = document.getElementById( match[3] );
 
-					// Make sure an element was located
-					if ( elem ){
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id != match[3] )
-							return jQuery().find( selector );
-
-						// Otherwise, we inject the element directly into the jQuery object
-						var ret = jQuery( elem );
-						ret.context = document;
-						ret.selector = selector;
-						return ret;
-					}
-					selector = [];
+					// Handle the case where IE and Opera return items
+					// by name instead of ID
+					if ( elem && elem.id != match[3] )
+						return jQuery().find( selector );
+
+					// Otherwise, we inject the element directly into the jQuery object
+					var ret = jQuery( elem || [] );
+					ret.context = document;
+					ret.selector = selector;
+					return ret;
 				}
 
 			// HANDLE: $(expr, [context])
@@ -99,7 +95,7 @@ jQuery.fn = jQuery.prototype = {
 	selector: "",
 
 	// The current version of jQuery being used
-	jquery: "1.3",
+	jquery: "1.3.1",
 
 	// The number of elements contained in the matched element set
 	size: function() {
@@ -634,8 +630,8 @@ jQuery.extend({
 
 	// check if an element is in a (or is an) XML document
 	isXMLDoc: function( elem ) {
-		return elem.documentElement && !elem.body ||
-			elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
+		return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||
+			!!elem.ownerDocument && jQuery.isXMLDoc( elem.ownerDocument );
 	},
 
 	// Evalulates a script in a global context
@@ -725,7 +721,7 @@ jQuery.extend({
 
 		// internal only, use hasClass("class")
 		has: function( elem, className ) {
-			return jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
+			return elem && jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
 		}
 	},
 
@@ -999,9 +995,11 @@ jQuery.extend({
 					var attributeNode = elem.getAttributeNode( "tabIndex" );
 					return attributeNode && attributeNode.specified
 						? attributeNode.value
-						: elem.nodeName.match(/^(a|area|button|input|object|select|textarea)$/i)
+						: elem.nodeName.match(/(button|input|object|select|textarea)/i)
 							? 0
-							: undefined;
+							: elem.nodeName.match(/^(a|area)$/i) && elem.href
+								? 0
+								: undefined;
 				}
 
 				return elem[ name ];
@@ -1397,14 +1395,14 @@ jQuery.fn.extend({
 		});

 	}

 });/*!
- * Sizzle CSS Selector Engine - v0.9.1
+ * Sizzle CSS Selector Engine - v0.9.3
  *  Copyright 2009, The Dojo Foundation
  *  Released under the MIT, BSD, and GPL Licenses.
  *  More information: http://sizzlejs.com/
  */
 (function(){
 
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|[^[\]]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g,
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]+['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g,
 	done = 0,
 	toString = Object.prototype.toString;
 
@@ -1433,40 +1431,27 @@ var Sizzle = function(selector, context, results, seed) {
 		}
 	}
 
-	if ( parts.length > 1 && Expr.match.POS.exec( selector ) ) {
+	if ( parts.length > 1 && origPOS.exec( selector ) ) {
 		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
-			var later = "", match;
-
-			// Position selectors must be done after the filter
-			while ( (match = Expr.match.POS.exec( selector )) ) {
-				later += match[0];
-				selector = selector.replace( Expr.match.POS, "" );
-			}
-
-			set = Sizzle.filter( later, Sizzle( /\s$/.test(selector) ? selector + "*" : selector, context ) );
+			set = posProcess( parts[0] + parts[1], context );
 		} else {
 			set = Expr.relative[ parts[0] ] ?
 				[ context ] :
 				Sizzle( parts.shift(), context );
 
 			while ( parts.length ) {
-				var tmpSet = [];
-
 				selector = parts.shift();
+
 				if ( Expr.relative[ selector ] )
 					selector += parts.shift();
 
-				for ( var i = 0, l = set.length; i < l; i++ ) {
-					Sizzle( selector, set[i], tmpSet );
-				}
-
-				set = tmpSet;
+				set = posProcess( selector, set );
 			}
 		}
 	} else {
 		var ret = seed ?
 			{ expr: parts.pop(), set: makeArray(seed) } :
-			Sizzle.find( parts.pop(), parts.length === 1 && context.parentNode ? context.parentNode : context );
+			Sizzle.find( parts.pop(), parts.length === 1 && context.parentNode ? context.parentNode : context, isXML(context) );
 		set = Sizzle.filter( ret.expr, ret.set );
 
 		if ( parts.length > 0 ) {
@@ -1531,7 +1516,7 @@ Sizzle.matches = function(expr, set){
 	return Sizzle(expr, null, null, set);
 };
 
-Sizzle.find = function(expr, context){
+Sizzle.find = function(expr, context, isXML){
 	var set, match;
 
 	if ( !expr ) {
@@ -1546,7 +1531,7 @@ Sizzle.find = function(expr, context){
 
 			if ( left.substr( left.length - 1 ) !== "\\" ) {
 				match[1] = (match[1] || "").replace(/\\/g, "");
-				set = Expr.find[ type ]( match, context );
+				set = Expr.find[ type ]( match, context, isXML );
 				if ( set != null ) {
 					expr = expr.replace( Expr.match[ type ], "" );
 					break;
@@ -1568,7 +1553,7 @@ Sizzle.filter = function(expr, set, inplace, not){
 	while ( expr && set.length ) {
 		for ( var type in Expr.filter ) {
 			if ( (match = Expr.match[ type ].exec( expr )) != null ) {
-				var filter = Expr.filter[ type ], goodArray = null, goodPos = 0, found, item;
+				var filter = Expr.filter[ type ], found, item;
 				anyFound = false;
 
 				if ( curLoop == result ) {
@@ -1582,26 +1567,13 @@ Sizzle.filter = function(expr, set, inplace, not){
 						anyFound = found = true;
 					} else if ( match === true ) {
 						continue;
-					} else if ( match[0] === true ) {
-						goodArray = [];
-						var last = null, elem;
-						for ( var i = 0; (elem = curLoop[i]) !== undefined; i++ ) {
-							if ( elem && last !== elem ) {
-								goodArray.push( elem );
-								last = elem;
-							}
-						}
 					}
 				}
 
 				if ( match ) {
-					for ( var i = 0; (item = curLoop[i]) !== undefined; i++ ) {
+					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
 						if ( item ) {
-							if ( goodArray && item != goodArray[goodPos] ) {
-								goodPos++;
-							}
-	
-							found = filter( item, match, goodPos, goodArray );
+							found = filter( item, match, i, curLoop );
 							var pass = not ^ !!found;
 
 							if ( inplace && found != null ) {
@@ -1739,14 +1711,16 @@ var Expr = Sizzle.selectors = {
 		}
 	},
 	find: {
-		ID: function(match, context){
-			if ( context.getElementById ) {
+		ID: function(match, context, isXML){
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
 				var m = context.getElementById(match[1]);
 				return m ? [m] : [];
 			}
 		},
-		NAME: function(match, context){
-			return context.getElementsByName ? context.getElementsByName(match[1]) : null;
+		NAME: function(match, context, isXML){
+			if ( typeof context.getElementsByName !== "undefined" && !isXML ) {
+				return context.getElementsByName(match[1]);
+			}
 		},
 		TAG: function(match, context){
 			return context.getElementsByTagName(match[1]);
@@ -1756,12 +1730,15 @@ var Expr = Sizzle.selectors = {
 		CLASS: function(match, curLoop, inplace, result, not){
 			match = " " + match[1].replace(/\\/g, "") + " ";
 
-			for ( var i = 0; curLoop[i]; i++ ) {
-				if ( not ^ (" " + curLoop[i].className + " ").indexOf(match) >= 0 ) {
-					if ( !inplace )
-						result.push( curLoop[i] );
-				} else if ( inplace ) {
-					curLoop[i] = false;
+			var elem;
+			for ( var i = 0; (elem = curLoop[i]) != null; i++ ) {
+				if ( elem ) {
+					if ( not ^ (" " + elem.className + " ").indexOf(match) >= 0 ) {
+						if ( !inplace )
+							result.push( elem );
+					} else if ( inplace ) {
+						curLoop[i] = false;
+					}
 				}
 			}
 
@@ -1771,8 +1748,8 @@ var Expr = Sizzle.selectors = {
 			return match[1].replace(/\\/g, "");
 		},
 		TAG: function(match, curLoop){
-			for ( var i = 0; !curLoop[i]; i++ ){}
-			return isXML(curLoop[i]) ? match[1] : match[1].toUpperCase();
+			for ( var i = 0; curLoop[i] === false; i++ ){}
+			return curLoop[i] && isXML(curLoop[i]) ? match[1] : match[1].toUpperCase();
 		},
 		CHILD: function(match){
 			if ( match[1] == "nth" ) {
@@ -1792,7 +1769,7 @@ var Expr = Sizzle.selectors = {
 			return match;
 		},
 		ATTR: function(match){
-			var name = match[1];
+			var name = match[1].replace(/\\/g, "");
 			
 			if ( Expr.attrMap[name] ) {
 				match[1] = Expr.attrMap[name];
@@ -1916,7 +1893,7 @@ var Expr = Sizzle.selectors = {
 		CHILD: function(elem, match){
 			var type = match[1], parent = elem.parentNode;
 
-			var doneName = "child" + parent.childNodes.length;
+			var doneName = match[0];
 			
 			if ( parent && (!parent[ doneName ] || !elem.nodeIndex) ) {
 				var count = 1;
@@ -1985,7 +1962,7 @@ var Expr = Sizzle.selectors = {
 		ATTR: function(elem, match){
 			var result = Expr.attrHandle[ match[1] ] ? Expr.attrHandle[ match[1] ]( elem ) : elem[ match[1] ] || elem.getAttribute( match[1] ), value = result + "", type = match[2], check = match[4];
 			return result == null ?
-				false :
+				type === "!=" :
 				type === "=" ?
 				value === check :
 				type === "*=" ?
@@ -2014,6 +1991,8 @@ var Expr = Sizzle.selectors = {
 	}
 };
 
+var origPOS = Expr.match.POS;
+
 for ( var type in Expr.match ) {
 	Expr.match[ type ] = RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );
 }
@@ -2072,15 +2051,15 @@ try {
 	// The workaround has to do additional checks after a getElementById
 	// Which slows things down for other browsers (hence the branching)
 	if ( !!document.getElementById( id ) ) {
-		Expr.find.ID = function(match, context){
-			if ( context.getElementById ) {
+		Expr.find.ID = function(match, context, isXML){
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
 				var m = context.getElementById(match[1]);
-				return m ? m.id === match[1] || m.getAttributeNode && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
+				return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
 			}
 		};
 
 		Expr.filter.ID = function(elem, match){
-			var node = elem.getAttributeNode && elem.getAttributeNode("id");
+			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
 			return elem.nodeType === 1 && node && node.nodeValue === match;
 		};
 	}
@@ -2120,7 +2099,7 @@ try {
 
 	// Check to see if an attribute returns normalized href attributes
 	div.innerHTML = "<a href='#'></a>";
-	if ( div.firstChild.getAttribute("href") !== "#" ) {
+	if ( div.firstChild && div.firstChild.getAttribute("href") !== "#" ) {
 		Expr.attrHandle.href = function(elem){
 			return elem.getAttribute("href", 2);
 		};
@@ -2128,12 +2107,21 @@ try {
 })();
 
 if ( document.querySelectorAll ) (function(){
-	var oldSizzle = Sizzle;
+	var oldSizzle = Sizzle, div = document.createElement("div");
+	div.innerHTML = "<p class='TEST'></p>";
+
+	// Safari can't handle uppercase or unicode characters when
+	// in quirks mode.
+	if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+		return;
+	}
 	
 	Sizzle = function(query, context, extra, seed){
 		context = context || document;
 
-		if ( !seed && context.nodeType === 9 ) {
+		// Only use querySelectorAll on non-XML documents
+		// (ID selectors don't work in non-HTML documents)
+		if ( !seed && context.nodeType === 9 && !isXML(context) ) {
 			try {
 				return makeArray( context.querySelectorAll(query), extra );
 			} catch(e){}
@@ -2148,7 +2136,7 @@ if ( document.querySelectorAll ) (function(){
 	Sizzle.matches = oldSizzle.matches;
 })();
 
-if ( document.documentElement.getElementsByClassName ) {
+if ( document.getElementsByClassName && document.documentElement.getElementsByClassName ) {
 	Expr.order.splice(1, 0, "CLASS");
 	Expr.find.CLASS = function(match, context) {
 		return context.getElementsByClassName(match[1]);
@@ -2229,8 +2217,28 @@ var contains = document.compareDocumentPosition ?  function(a, b){
 };
 
 var isXML = function(elem){
-	return elem.documentElement && !elem.body ||
-		elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
+	return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||
+		!!elem.ownerDocument && isXML( elem.ownerDocument );
+};
+
+var posProcess = function(selector, context){
+	var tmpSet = [], later = "", match,
+		root = context.nodeType ? [context] : context;
+
+	// Position selectors must be done after the filter
+	// And so must :not(positional) so we move all PSEUDOs to the end
+	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+		later += match[0];
+		selector = selector.replace( Expr.match.PSEUDO, "" );
+	}
+
+	selector = Expr.relative[selector] ? selector + "*" : selector;
+
+	for ( var i = 0, l = root.length; i < l; i++ ) {
+		Sizzle( selector, root[i], tmpSet );
+	}
+
+	return Sizzle.filter( later, tmpSet );
 };
 
 // EXPOSE
@@ -2681,13 +2689,13 @@ jQuery.Event = function( src ){
 	if( src && src.type ){
 		this.originalEvent = src;
 		this.type = src.type;
-		this.timeStamp = src.timeStamp;
 	// Event type
 	}else
 		this.type = src;
 
-	if( !this.timeStamp )
-		this.timeStamp = now();
+	// timeStamp is buggy for some events on Firefox(#3843)
+	// So we won't rely on the native value
+	this.timeStamp = now();
 	
 	// Mark it as fixed
 	this[expando] = true;
@@ -2876,9 +2884,8 @@ function liveHandler( event ){
 	});
 
 	jQuery.each(elems, function(){
-		if ( !event.isImmediatePropagationStopped() &&
-			this.fn.call(this.elem, event, this.fn.data) === false )
-				stop = false;
+		if ( this.fn.call(this.elem, event, this.fn.data) === false )
+			stop = false;
 	});
 
 	return stop;
@@ -2942,7 +2949,7 @@ function bindReady(){
 
 		// If IE and not an iframe
 		// continually check to see if the document is ready
-		if ( document.documentElement.doScroll && !window.frameElement ) (function(){
+		if ( document.documentElement.doScroll && typeof window.frameElement === "undefined" ) (function(){
 			if ( jQuery.isReady ) return;
 
 			try {
@@ -3477,6 +3484,9 @@ jQuery.extend({
 				// Fire the complete handlers
 				complete();
 
+				if ( isTimeout )
+					xhr.abort();
+
 				// Stop memory leaks
 				if ( s.async )
 					xhr = null;
@@ -3491,14 +3501,8 @@ jQuery.extend({
 			if ( s.timeout > 0 )
 				setTimeout(function(){
 					// Check to see if the request is still happening
-					if ( xhr ) {
-						if( !requestDone )
-							onreadystatechange( "timeout" );
-
-						// Cancel the request
-						if ( xhr )
-							xhr.abort();
-					}
+					if ( xhr && !requestDone )
+						onreadystatechange( "timeout" );
 				}, s.timeout);
 		}
 
@@ -3637,6 +3641,7 @@ jQuery.extend({
 
 });
 var elemdisplay = {},
+	timerId,
 	fxAttrs = [
 		// height animations
 		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
@@ -3859,7 +3864,6 @@ jQuery.extend({
 	},
 
 	timers: [],
-	timerId: null,
 
 	fx: function( elem, options, prop ){
 		this.options = options;
@@ -3911,10 +3915,8 @@ jQuery.fx.prototype = {
 
 		t.elem = this.elem;
 
-		jQuery.timers.push(t);
-
-		if ( t() && jQuery.timerId == null ) {
-			jQuery.timerId = setInterval(function(){
+		if ( t() && jQuery.timers.push(t) == 1 ) {
+			timerId = setInterval(function(){
 				var timers = jQuery.timers;
 
 				for ( var i = 0; i < timers.length; i++ )
@@ -3922,8 +3924,7 @@ jQuery.fx.prototype = {
 						timers.splice(i--, 1);
 
 				if ( !timers.length ) {
-					clearInterval( jQuery.timerId );
-					jQuery.timerId = null;
+					clearInterval( timerId );
 				}
 			}, 13);
 		}
@@ -3989,11 +3990,10 @@ jQuery.fx.prototype = {
 				if ( this.options.hide || this.options.show )
 					for ( var p in this.options.curAnim )
 						jQuery.attr(this.elem.style, p, this.options.orig[p]);
-			}
-
-			if ( done )
+					
 				// Execute the complete function
 				this.options.complete.call( this.elem );
+			}
 
 			return false;
 		} else {
@@ -4087,7 +4087,7 @@ jQuery.offset = {
 	initialize: function() {
 		if ( this.initialized ) return;
 		var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, rules, prop, bodyMarginTop = body.style.marginTop,
-			html = '<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"cellpadding="0"cellspacing="0"><tr><td></td></tr></table>';
+			html = '<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';
 
 		rules = { position: 'absolute', top: 0, left: 0, margin: 0, border: 0, width: '1px', height: '1px', visibility: 'hidden' };
 		for ( prop in rules ) container.style[prop] = rules[prop];
diff --git a/js/jquery.min.js b/js/jquery.min.js
index 396646c84..c327fae81 100644
--- a/js/jquery.min.js
+++ b/js/jquery.min.js
@@ -1,19 +1,19 @@
 /*
- * jQuery JavaScript Library v1.3
+ * jQuery JavaScript Library v1.3.1
  * http://jquery.com/
  *
  * Copyright (c) 2009 John Resig
  * Dual licensed under the MIT and GPL licenses.
  * http://docs.jquery.com/License
  *
- * Date: 2009-01-13 12:50:31 -0500 (Tue, 13 Jan 2009)
- * Revision: 6104
+ * Date: 2009-01-21 20:42:16 -0500 (Wed, 21 Jan 2009)
+ * Revision: 6158
  */
-(function(){var l=this,g,x=l.jQuery,o=l.$,n=l.jQuery=l.$=function(D,E){return new n.fn.init(D,E)},C=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;n.fn=n.prototype={init:function(D,G){D=D||document;if(D.nodeType){this[0]=D;this.length=1;this.context=D;return this}if(typeof D==="string"){var F=C.exec(D);if(F&&(F[1]||!G)){if(F[1]){D=n.clean([F[1]],G)}else{var H=document.getElementById(F[3]);if(H){if(H.id!=F[3]){return n().find(D)}var E=n(H);E.context=document;E.selector=D;return E}D=[]}}else{return n(G).find(D)}}else{if(n.isFunction(D)){return n(document).ready(D)}}if(D.selector&&D.context){this.selector=D.selector;this.context=D.context}return this.setArray(n.makeArray(D))},selector:"",jquery:"1.3",size:function(){return this.length},get:function(D){return D===g?n.makeArray(this):this[D]},pushStack:function(E,G,D){var F=n(E);F.prevObject=this;F.context=this.context;if(G==="find"){F.selector=this.selector+(this.selector?" ":"")+D}else{if(G){F.selector=this.selector+"."+G+"("+D+")"}}return F},setArray:function(D){this.length=0;Array.prototype.push.apply(this,D);return this},each:function(E,D){return n.each(this,E,D)},index:function(D){return n.inArray(D&&D.jquery?D[0]:D,this)},attr:function(E,G,F){var D=E;if(typeof E==="string"){if(G===g){return this[0]&&n[F||"attr"](this[0],E)}else{D={};D[E]=G}}return this.each(function(H){for(E in D){n.attr(F?this.style:this,E,n.prop(this,D[E],F,H,E))}})},css:function(D,E){if((D=="width"||D=="height")&&parseFloat(E)<0){E=g}return this.attr(D,E,"curCSS")},text:function(E){if(typeof E!=="object"&&E!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(E))}var D="";n.each(E||this,function(){n.each(this.childNodes,function(){if(this.nodeType!=8){D+=this.nodeType!=1?this.nodeValue:n.fn.text([this])}})});return D},wrapAll:function(D){if(this[0]){var E=n(D,this[0].ownerDocument).clone();if(this[0].parentNode){E.insertBefore(this[0])}E.map(function(){var F=this;while(F.firstChild){F=F.firstChild}return F}).append(this)}return this},wrapInner:function(D){return this.each(function(){n(this).contents().wrapAll(D)})},wrap:function(D){return this.each(function(){n(this).wrapAll(D)})},append:function(){return this.domManip(arguments,true,function(D){if(this.nodeType==1){this.appendChild(D)}})},prepend:function(){return this.domManip(arguments,true,function(D){if(this.nodeType==1){this.insertBefore(D,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(D){this.parentNode.insertBefore(D,this)})},after:function(){return this.domManip(arguments,false,function(D){this.parentNode.insertBefore(D,this.nextSibling)})},end:function(){return this.prevObject||n([])},push:[].push,find:function(D){if(this.length===1&&!/,/.test(D)){var F=this.pushStack([],"find",D);F.length=0;n.find(D,this[0],F);return F}else{var E=n.map(this,function(G){return n.find(D,G)});return this.pushStack(/[^+>] [^+>]/.test(D)?n.unique(E):E,"find",D)}},clone:function(E){var D=this.map(function(){if(!n.support.noCloneEvent&&!n.isXMLDoc(this)){var H=this.cloneNode(true),G=document.createElement("div");G.appendChild(H);return n.clean([G.innerHTML])[0]}else{return this.cloneNode(true)}});var F=D.find("*").andSelf().each(function(){if(this[h]!==g){this[h]=null}});if(E===true){this.find("*").andSelf().each(function(H){if(this.nodeType==3){return}var G=n.data(this,"events");for(var J in G){for(var I in G[J]){n.event.add(F[H],J,G[J][I],G[J][I].data)}}})}return D},filter:function(D){return this.pushStack(n.isFunction(D)&&n.grep(this,function(F,E){return D.call(F,E)})||n.multiFilter(D,n.grep(this,function(E){return E.nodeType===1})),"filter",D)},closest:function(D){var E=n.expr.match.POS.test(D)?n(D):null;return this.map(function(){var F=this;while(F&&F.ownerDocument){if(E?E.index(F)>-1:n(F).is(D)){return F}F=F.parentNode}})},not:function(D){if(typeof D==="string"){if(f.test(D)){return this.pushStack(n.multiFilter(D,this,true),"not",D)}else{D=n.multiFilter(D,this)}}var E=D.length&&D[D.length-1]!==g&&!D.nodeType;return this.filter(function(){return E?n.inArray(this,D)<0:this!=D})},add:function(D){return this.pushStack(n.unique(n.merge(this.get(),typeof D==="string"?n(D):n.makeArray(D))))},is:function(D){return !!D&&n.multiFilter(D,this).length>0},hasClass:function(D){return !!D&&this.is("."+D)},val:function(J){if(J===g){var D=this[0];if(D){if(n.nodeName(D,"option")){return(D.attributes.value||{}).specified?D.value:D.text}if(n.nodeName(D,"select")){var H=D.selectedIndex,K=[],L=D.options,G=D.type=="select-one";if(H<0){return null}for(var E=G?H:0,I=G?H+1:L.length;E<I;E++){var F=L[E];if(F.selected){J=n(F).val();if(G){return J}K.push(J)}}return K}return(D.value||"").replace(/\r/g,"")}return g}if(typeof J==="number"){J+=""}return this.each(function(){if(this.nodeType!=1){return}if(n.isArray(J)&&/radio|checkbox/.test(this.type)){this.checked=(n.inArray(this.value,J)>=0||n.inArray(this.name,J)>=0)}else{if(n.nodeName(this,"select")){var M=n.makeArray(J);n("option",this).each(function(){this.selected=(n.inArray(this.value,M)>=0||n.inArray(this.text,M)>=0)});if(!M.length){this.selectedIndex=-1}}else{this.value=J}}})},html:function(D){return D===g?(this[0]?this[0].innerHTML:null):this.empty().append(D)},replaceWith:function(D){return this.after(D).remove()},eq:function(D){return this.slice(D,+D+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(D){return this.pushStack(n.map(this,function(F,E){return D.call(F,E,F)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=n.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild,D=this.length>1?I.cloneNode(true):I;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(this[G],H),G>0?D.cloneNode(true):I)}}if(F){n.each(F,y)}}return this;function K(N,O){return M&&n.nodeName(N,"table")&&n.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};n.fn.init.prototype=n.fn;function y(D,E){if(E.src){n.ajax({url:E.src,async:false,dataType:"script"})}else{n.globalEval(E.text||E.textContent||E.innerHTML||"")}if(E.parentNode){E.parentNode.removeChild(E)}}function e(){return +new Date}n.extend=n.fn.extend=function(){var I=arguments[0]||{},G=1,H=arguments.length,D=false,F;if(typeof I==="boolean"){D=I;I=arguments[1]||{};G=2}if(typeof I!=="object"&&!n.isFunction(I)){I={}}if(H==G){I=this;--G}for(;G<H;G++){if((F=arguments[G])!=null){for(var E in F){var J=I[E],K=F[E];if(I===K){continue}if(D&&K&&typeof K==="object"&&!K.nodeType){I[E]=n.extend(D,J||(K.length!=null?[]:{}),K)}else{if(K!==g){I[E]=K}}}}}return I};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,p=document.defaultView||{},r=Object.prototype.toString;n.extend({noConflict:function(D){l.$=o;if(D){l.jQuery=x}return n},isFunction:function(D){return r.call(D)==="[object Function]"},isArray:function(D){return r.call(D)==="[object Array]"},isXMLDoc:function(D){return D.documentElement&&!D.body||D.tagName&&D.ownerDocument&&!D.ownerDocument.body},globalEval:function(F){F=n.trim(F);if(F){var E=document.getElementsByTagName("head")[0]||document.documentElement,D=document.createElement("script");D.type="text/javascript";if(n.support.scriptEval){D.appendChild(document.createTextNode(F))}else{D.text=F}E.insertBefore(D,E.firstChild);E.removeChild(D)}},nodeName:function(E,D){return E.nodeName&&E.nodeName.toUpperCase()==D.toUpperCase()},each:function(F,J,E){var D,G=0,H=F.length;if(E){if(H===g){for(D in F){if(J.apply(F[D],E)===false){break}}}else{for(;G<H;){if(J.apply(F[G++],E)===false){break}}}}else{if(H===g){for(D in F){if(J.call(F[D],D,F[D])===false){break}}}else{for(var I=F[0];G<H&&J.call(I,G,I)!==false;I=F[++G]){}}}return F},prop:function(G,H,F,E,D){if(n.isFunction(H)){H=H.call(G,E)}return typeof H==="number"&&F=="curCSS"&&!b.test(D)?H+"px":H},className:{add:function(D,E){n.each((E||"").split(/\s+/),function(F,G){if(D.nodeType==1&&!n.className.has(D.className,G)){D.className+=(D.className?" ":"")+G}})},remove:function(D,E){if(D.nodeType==1){D.className=E!==g?n.grep(D.className.split(/\s+/),function(F){return !n.className.has(E,F)}).join(" "):""}},has:function(E,D){return n.inArray(D,(E.className||E).toString().split(/\s+/))>-1}},swap:function(G,F,H){var D={};for(var E in F){D[E]=G.style[E];G.style[E]=F[E]}H.call(G);for(var E in F){G.style[E]=D[E]}},css:function(F,D,H){if(D=="width"||D=="height"){var J,E={position:"absolute",visibility:"hidden",display:"block"},I=D=="width"?["Left","Right"]:["Top","Bottom"];function G(){J=D=="width"?F.offsetWidth:F.offsetHeight;var L=0,K=0;n.each(I,function(){L+=parseFloat(n.curCSS(F,"padding"+this,true))||0;K+=parseFloat(n.curCSS(F,"border"+this+"Width",true))||0});J-=Math.round(L+K)}if(n(F).is(":visible")){G()}else{n.swap(F,E,G)}return Math.max(0,J)}return n.curCSS(F,D,H)},curCSS:function(H,E,F){var K,D=H.style;if(E=="opacity"&&!n.support.opacity){K=n.attr(D,"opacity");return K==""?"1":K}if(E.match(/float/i)){E=v}if(!F&&D&&D[E]){K=D[E]}else{if(p.getComputedStyle){if(E.match(/float/i)){E="float"}E=E.replace(/([A-Z])/g,"-$1").toLowerCase();var L=p.getComputedStyle(H,null);if(L){K=L.getPropertyValue(E)}if(E=="opacity"&&K==""){K="1"}}else{if(H.currentStyle){var I=E.replace(/\-(\w)/g,function(M,N){return N.toUpperCase()});K=H.currentStyle[E]||H.currentStyle[I];if(!/^\d+(px)?$/i.test(K)&&/^\d/.test(K)){var G=D.left,J=H.runtimeStyle.left;H.runtimeStyle.left=H.currentStyle.left;D.left=K||0;K=D.pixelLeft+"px";D.left=G;H.runtimeStyle.left=J}}}}return K},clean:function(E,J,H){J=J||document;if(typeof J.createElement==="undefined"){J=J.ownerDocument||J[0]&&J[0].ownerDocument||document}if(!H&&E.length===1&&typeof E[0]==="string"){var G=/^<(\w+)\s*\/?>$/.exec(E[0]);if(G){return[J.createElement(G[1])]}}var F=[],D=[],K=J.createElement("div");n.each(E,function(O,Q){if(typeof Q==="number"){Q+=""}if(!Q){return}if(typeof Q==="string"){Q=Q.replace(/(<(\w+)[^>]*?)\/>/g,function(S,T,R){return R.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?S:T+"></"+R+">"});var N=n.trim(Q).toLowerCase();var P=!N.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!N.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||N.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!N.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!N.indexOf("<td")||!N.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!N.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!n.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];K.innerHTML=P[1]+Q+P[2];while(P[0]--){K=K.lastChild}if(!n.support.tbody){var M=!N.indexOf("<table")&&N.indexOf("<tbody")<0?K.firstChild&&K.firstChild.childNodes:P[1]=="<table>"&&N.indexOf("<tbody")<0?K.childNodes:[];for(var L=M.length-1;L>=0;--L){if(n.nodeName(M[L],"tbody")&&!M[L].childNodes.length){M[L].parentNode.removeChild(M[L])}}}if(!n.support.leadingWhitespace&&/^\s/.test(Q)){K.insertBefore(J.createTextNode(Q.match(/^\s*/)[0]),K.firstChild)}Q=n.makeArray(K.childNodes)}if(Q.nodeType){F.push(Q)}else{F=n.merge(F,Q)}});if(H){for(var I=0;F[I];I++){if(n.nodeName(F[I],"script")&&(!F[I].type||F[I].type.toLowerCase()==="text/javascript")){D.push(F[I].parentNode?F[I].parentNode.removeChild(F[I]):F[I])}else{if(F[I].nodeType===1){F.splice.apply(F,[I+1,0].concat(n.makeArray(F[I].getElementsByTagName("script"))))}H.appendChild(F[I])}}return D}return F},attr:function(I,F,J){if(!I||I.nodeType==3||I.nodeType==8){return g}var G=!n.isXMLDoc(I),K=J!==g;F=G&&n.props[F]||F;if(I.tagName){var E=/href|src|style/.test(F);if(F=="selected"&&I.parentNode){I.parentNode.selectedIndex}if(F in I&&G&&!E){if(K){if(F=="type"&&n.nodeName(I,"input")&&I.parentNode){throw"type property can't be changed"}I[F]=J}if(n.nodeName(I,"form")&&I.getAttributeNode(F)){return I.getAttributeNode(F).nodeValue}if(F=="tabIndex"){var H=I.getAttributeNode("tabIndex");return H&&H.specified?H.value:I.nodeName.match(/^(a|area|button|input|object|select|textarea)$/i)?0:g}return I[F]}if(!n.support.style&&G&&F=="style"){return n.attr(I.style,"cssText",J)}if(K){I.setAttribute(F,""+J)}var D=!n.support.hrefNormalized&&G&&E?I.getAttribute(F,2):I.getAttribute(F);return D===null?g:D}if(!n.support.opacity&&F=="opacity"){if(K){I.zoom=1;I.filter=(I.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(J)+""=="NaN"?"":"alpha(opacity="+J*100+")")}return I.filter&&I.filter.indexOf("opacity=")>=0?(parseFloat(I.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}F=F.replace(/-([a-z])/ig,function(L,M){return M.toUpperCase()});if(K){I[F]=J}return I[F]},trim:function(D){return(D||"").replace(/^\s+|\s+$/g,"")},makeArray:function(F){var D=[];if(F!=null){var E=F.length;if(E==null||typeof F==="string"||n.isFunction(F)||F.setInterval){D[0]=F}else{while(E){D[--E]=F[E]}}}return D},inArray:function(F,G){for(var D=0,E=G.length;D<E;D++){if(G[D]===F){return D}}return -1},merge:function(G,D){var E=0,F,H=G.length;if(!n.support.getAll){while((F=D[E++])!=null){if(F.nodeType!=8){G[H++]=F}}}else{while((F=D[E++])!=null){G[H++]=F}}return G},unique:function(J){var E=[],D={};try{for(var F=0,G=J.length;F<G;F++){var I=n.data(J[F]);if(!D[I]){D[I]=true;E.push(J[F])}}}catch(H){E=J}return E},grep:function(E,I,D){var F=[];for(var G=0,H=E.length;G<H;G++){if(!D!=!I(E[G],G)){F.push(E[G])}}return F},map:function(D,I){var E=[];for(var F=0,G=D.length;F<G;F++){var H=I(D[F],F);if(H!=null){E[E.length]=H}}return E.concat.apply([],E)}});var B=navigator.userAgent.toLowerCase();n.browser={version:(B.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(B),opera:/opera/.test(B),msie:/msie/.test(B)&&!/opera/.test(B),mozilla:/mozilla/.test(B)&&!/(compatible|webkit)/.test(B)};n.each({parent:function(D){return D.parentNode},parents:function(D){return n.dir(D,"parentNode")},next:function(D){return n.nth(D,2,"nextSibling")},prev:function(D){return n.nth(D,2,"previousSibling")},nextAll:function(D){return n.dir(D,"nextSibling")},prevAll:function(D){return n.dir(D,"previousSibling")},siblings:function(D){return n.sibling(D.parentNode.firstChild,D)},children:function(D){return n.sibling(D.firstChild)},contents:function(D){return n.nodeName(D,"iframe")?D.contentDocument||D.contentWindow.document:n.makeArray(D.childNodes)}},function(D,E){n.fn[D]=function(F){var G=n.map(this,E);if(F&&typeof F=="string"){G=n.multiFilter(F,G)}return this.pushStack(n.unique(G),D,F)}});n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(D,E){n.fn[D]=function(){var F=arguments;return this.each(function(){for(var G=0,H=F.length;G<H;G++){n(F[G])[E](this)}})}});n.each({removeAttr:function(D){n.attr(this,D,"");if(this.nodeType==1){this.removeAttribute(D)}},addClass:function(D){n.className.add(this,D)},removeClass:function(D){n.className.remove(this,D)},toggleClass:function(E,D){if(typeof D!=="boolean"){D=!n.className.has(this,E)}n.className[D?"add":"remove"](this,E)},remove:function(D){if(!D||n.filter(D,[this]).length){n("*",this).add([this]).each(function(){n.event.remove(this);n.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){n(">*",this).remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(D,E){n.fn[D]=function(){return this.each(E,arguments)}});function j(D,E){return D[0]&&parseInt(n.curCSS(D[0],E,true),10)||0}var h="jQuery"+e(),u=0,z={};n.extend({cache:{},data:function(E,D,F){E=E==l?z:E;var G=E[h];if(!G){G=E[h]=++u}if(D&&!n.cache[G]){n.cache[G]={}}if(F!==g){n.cache[G][D]=F}return D?n.cache[G][D]:G},removeData:function(E,D){E=E==l?z:E;var G=E[h];if(D){if(n.cache[G]){delete n.cache[G][D];D="";for(D in n.cache[G]){break}if(!D){n.removeData(E)}}}else{try{delete E[h]}catch(F){if(E.removeAttribute){E.removeAttribute(h)}}delete n.cache[G]}},queue:function(E,D,G){if(E){D=(D||"fx")+"queue";var F=n.data(E,D);if(!F||n.isArray(G)){F=n.data(E,D,n.makeArray(G))}else{if(G){F.push(G)}}}return F},dequeue:function(G,F){var D=n.queue(G,F),E=D.shift();if(!F||F==="fx"){E=D[0]}if(E!==g){E.call(G)}}});n.fn.extend({data:function(D,F){var G=D.split(".");G[1]=G[1]?"."+G[1]:"";if(F===g){var E=this.triggerHandler("getData"+G[1]+"!",[G[0]]);if(E===g&&this.length){E=n.data(this[0],D)}return E===g&&G[1]?this.data(G[0]):E}else{return this.trigger("setData"+G[1]+"!",[G[0],F]).each(function(){n.data(this,D,F)})}},removeData:function(D){return this.each(function(){n.removeData(this,D)})},queue:function(D,E){if(typeof D!=="string"){E=D;D="fx"}if(E===g){return n.queue(this[0],D)}return this.each(function(){var F=n.queue(this,D,E);if(D=="fx"&&F.length==1){F[0].call(this)}})},dequeue:function(D){return this.each(function(){n.dequeue(this,D)})}});
+(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.makeArray(E))},selector:"",jquery:"1.3.1",size:function(){return this.length},get:function(E){return E===g?o.makeArray(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,find:function(E){if(this.length===1&&!/,/.test(E)){var G=this.pushStack([],"find",E);G.length=0;o.find(E,this[0],G);return G}else{var F=o.map(this,function(H){return o.find(E,H)});return this.pushStack(/[^+>] [^+>]/.test(E)?o.unique(F):F,"find",E)}},clone:function(F){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.cloneNode(true),H=document.createElement("div");H.appendChild(I);return o.clean([H.innerHTML])[0]}else{return this.cloneNode(true)}});var G=E.find("*").andSelf().each(function(){if(this[h]!==g){this[h]=null}});if(F===true){this.find("*").andSelf().each(function(I){if(this.nodeType==3){return}var H=o.data(this,"events");for(var K in H){for(var J in H[K]){o.event.add(G[I],K,H[K][J],H[K][J].data)}}})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var F=o.expr.match.POS.test(E)?o(E):null;return this.map(function(){var G=this;while(G&&G.ownerDocument){if(F?F.index(G)>-1:o(G).is(E)){return G}G=G.parentNode}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML:null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(K,N,M){if(this[0]){var J=(this[0].ownerDocument||this[0]).createDocumentFragment(),G=o.clean(K,(this[0].ownerDocument||this[0]),J),I=J.firstChild,E=this.length>1?J.cloneNode(true):J;if(I){for(var H=0,F=this.length;H<F;H++){M.call(L(this[H],I),H>0?E.cloneNode(true):J)}}if(G){o.each(G,z)}}return this;function L(O,P){return N&&o.nodeName(O,"table")&&o.nodeName(P,"tr")?(O.getElementsByTagName("tbody")[0]||O.appendChild(O.ownerDocument.createElement("tbody"))):O}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){G=o.trim(G);if(G){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(G,E,I){if(E=="width"||E=="height"){var K,F={position:"absolute",visibility:"hidden",display:"block"},J=E=="width"?["Left","Right"]:["Top","Bottom"];function H(){K=E=="width"?G.offsetWidth:G.offsetHeight;var M=0,L=0;o.each(J,function(){M+=parseFloat(o.curCSS(G,"padding"+this,true))||0;L+=parseFloat(o.curCSS(G,"border"+this+"Width",true))||0});K-=Math.round(M+L)}if(o(G).is(":visible")){H()}else{o.swap(G,F,H)}return Math.max(0,K)}return o.curCSS(G,E,I)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,R){if(typeof R==="number"){R+=""}if(!R){return}if(typeof R==="string"){R=R.replace(/(<(\w+)[^>]*?)\/>/g,function(T,U,S){return S.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?T:U+"></"+S+">"});var O=o.trim(R).toLowerCase();var Q=!O.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!O.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!O.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!O.indexOf("<td")||!O.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!O.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!o.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];L.innerHTML=Q[1]+R+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var N=!O.indexOf("<table")&&O.indexOf("<tbody")<0?L.firstChild&&L.firstChild.childNodes:Q[1]=="<table>"&&O.indexOf("<tbody")<0?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(R)){L.insertBefore(K.createTextNode(R.match(/^\s*/)[0]),L.firstChild)}R=o.makeArray(L.childNodes)}if(R.nodeType){G.push(R)}else{G=o.merge(G,R)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E<F;E++){if(H[E]===G){return E}}return -1},merge:function(H,E){var F=0,G,I=H.length;if(!o.support.getAll){while((G=E[F++])!=null){if(G.nodeType!=8){H[I++]=G}}}else{while((G=E[F++])!=null){H[I++]=G}}return H},unique:function(K){var F=[],E={};try{for(var G=0,H=K.length;G<H;G++){var J=o.data(K[G]);if(!E[J]){E[J]=true;F.push(K[G])}}}catch(I){F=K}return F},grep:function(F,J,E){var G=[];for(var H=0,I=F.length;H<I;H++){if(!E!=!J(F[H],H)){G.push(F[H])}}return G},map:function(E,J){var F=[];for(var G=0,H=E.length;G<H;G++){var I=J(E[G],G);if(I!=null){F[F.length]=I}}return F.concat.apply([],F)}});var C=navigator.userAgent.toLowerCase();o.browser={version:(C.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(C),opera:/opera/.test(C),msie:/msie/.test(C)&&!/opera/.test(C),mozilla:/mozilla/.test(C)&&!/(compatible|webkit)/.test(C)};o.each({parent:function(E){return E.parentNode},parents:function(E){return o.dir(E,"parentNode")},next:function(E){return o.nth(E,2,"nextSibling")},prev:function(E){return o.nth(E,2,"previousSibling")},nextAll:function(E){return o.dir(E,"nextSibling")},prevAll:function(E){return o.dir(E,"previousSibling")},siblings:function(E){return o.sibling(E.parentNode.firstChild,E)},children:function(E){return o.sibling(E.firstChild)},contents:function(E){return o.nodeName(E,"iframe")?E.contentDocument||E.contentWindow.document:o.makeArray(E.childNodes)}},function(E,F){o.fn[E]=function(G){var H=o.map(this,F);if(G&&typeof G=="string"){H=o.multiFilter(G,H)}return this.pushStack(o.unique(H),E,G)}});o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(E,F){o.fn[E]=function(){var G=arguments;return this.each(function(){for(var H=0,I=G.length;H<I;H++){o(G[H])[F](this)}})}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(">*",this).remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
 /*
- * Sizzle CSS Selector Engine - v0.9.1
+ * Sizzle CSS Selector Engine - v0.9.3
  *  Copyright 2009, The Dojo Foundation
  *  Released under the MIT, BSD, and GPL Licenses.
  *  More information: http://sizzlejs.com/
  */
-(function(){var N=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|[^[\]]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g,I=0,F=Object.prototype.toString;var E=function(ae,S,aa,V){aa=aa||[];S=S||document;if(S.nodeType!==1&&S.nodeType!==9){return[]}if(!ae||typeof ae!=="string"){return aa}var ab=[],ac,Y,ah,ag,Z,R,Q=true;N.lastIndex=0;while((ac=N.exec(ae))!==null){ab.push(ac[1]);if(ac[2]){R=RegExp.rightContext;break}}if(ab.length>1&&G.match.POS.exec(ae)){if(ab.length===2&&G.relative[ab[0]]){var U="",X;while((X=G.match.POS.exec(ae))){U+=X[0];ae=ae.replace(G.match.POS,"")}Y=E.filter(U,E(/\s$/.test(ae)?ae+"*":ae,S))}else{Y=G.relative[ab[0]]?[S]:E(ab.shift(),S);while(ab.length){var P=[];ae=ab.shift();if(G.relative[ae]){ae+=ab.shift()}for(var af=0,ad=Y.length;af<ad;af++){E(ae,Y[af],P)}Y=P}}}else{var ai=V?{expr:ab.pop(),set:D(V)}:E.find(ab.pop(),ab.length===1&&S.parentNode?S.parentNode:S);Y=E.filter(ai.expr,ai.set);if(ab.length>0){ah=D(Y)}else{Q=false}while(ab.length){var T=ab.pop(),W=T;if(!G.relative[T]){T=""}else{W=ab.pop()}if(W==null){W=S}G.relative[T](ah,W,M(S))}}if(!ah){ah=Y}if(!ah){throw"Syntax error, unrecognized expression: "+(T||ae)}if(F.call(ah)==="[object Array]"){if(!Q){aa.push.apply(aa,ah)}else{if(S.nodeType===1){for(var af=0;ah[af]!=null;af++){if(ah[af]&&(ah[af]===true||ah[af].nodeType===1&&H(S,ah[af]))){aa.push(Y[af])}}}else{for(var af=0;ah[af]!=null;af++){if(ah[af]&&ah[af].nodeType===1){aa.push(Y[af])}}}}}else{D(ah,aa)}if(R){E(R,S,aa,V)}return aa};E.matches=function(P,Q){return E(P,null,null,Q)};E.find=function(V,S){var W,Q;if(!V){return[]}for(var R=0,P=G.order.length;R<P;R++){var T=G.order[R],Q;if((Q=G.match[T].exec(V))){var U=RegExp.leftContext;if(U.substr(U.length-1)!=="\\"){Q[1]=(Q[1]||"").replace(/\\/g,"");W=G.find[T](Q,S);if(W!=null){V=V.replace(G.match[T],"");break}}}}if(!W){W=S.getElementsByTagName("*")}return{set:W,expr:V}};E.filter=function(S,ac,ad,T){var Q=S,Y=[],ah=ac,V,ab;while(S&&ac.length){for(var U in G.filter){if((V=G.match[U].exec(S))!=null){var Z=G.filter[U],R=null,X=0,aa,ag;ab=false;if(ah==Y){Y=[]}if(G.preFilter[U]){V=G.preFilter[U](V,ah,ad,Y,T);if(!V){ab=aa=true}else{if(V===true){continue}else{if(V[0]===true){R=[];var W=null,af;for(var ae=0;(af=ah[ae])!==g;ae++){if(af&&W!==af){R.push(af);W=af}}}}}}if(V){for(var ae=0;(ag=ah[ae])!==g;ae++){if(ag){if(R&&ag!=R[X]){X++}aa=Z(ag,V,X,R);var P=T^!!aa;if(ad&&aa!=null){if(P){ab=true}else{ah[ae]=false}}else{if(P){Y.push(ag);ab=true}}}}}if(aa!==g){if(!ad){ah=Y}S=S.replace(G.match[U],"");if(!ab){return[]}break}}}S=S.replace(/\s*,\s*/,"");if(S==Q){if(ab==null){throw"Syntax error, unrecognized expression: "+S}else{break}}Q=S}return ah};var G=E.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(P){return P.getAttribute("href")}},relative:{"+":function(T,Q){for(var R=0,P=T.length;R<P;R++){var S=T[R];if(S){var U=S.previousSibling;while(U&&U.nodeType!==1){U=U.previousSibling}T[R]=typeof Q==="string"?U||false:U===Q}}if(typeof Q==="string"){E.filter(Q,T,true)}},">":function(U,Q,V){if(typeof Q==="string"&&!/\W/.test(Q)){Q=V?Q:Q.toUpperCase();for(var R=0,P=U.length;R<P;R++){var T=U[R];if(T){var S=T.parentNode;U[R]=S.nodeName===Q?S:false}}}else{for(var R=0,P=U.length;R<P;R++){var T=U[R];if(T){U[R]=typeof Q==="string"?T.parentNode:T.parentNode===Q}}if(typeof Q==="string"){E.filter(Q,U,true)}}},"":function(S,Q,U){var R="done"+(I++),P=O;if(!Q.match(/\W/)){var T=Q=U?Q:Q.toUpperCase();P=L}P("parentNode",Q,R,S,T,U)},"~":function(S,Q,U){var R="done"+(I++),P=O;if(typeof Q==="string"&&!Q.match(/\W/)){var T=Q=U?Q:Q.toUpperCase();P=L}P("previousSibling",Q,R,S,T,U)}},find:{ID:function(Q,R){if(R.getElementById){var P=R.getElementById(Q[1]);return P?[P]:[]}},NAME:function(P,Q){return Q.getElementsByName?Q.getElementsByName(P[1]):null},TAG:function(P,Q){return Q.getElementsByTagName(P[1])}},preFilter:{CLASS:function(S,Q,R,P,U){S=" "+S[1].replace(/\\/g,"")+" ";for(var T=0;Q[T];T++){if(U^(" "+Q[T].className+" ").indexOf(S)>=0){if(!R){P.push(Q[T])}}else{if(R){Q[T]=false}}}return false},ID:function(P){return P[1].replace(/\\/g,"")},TAG:function(Q,P){for(var R=0;!P[R];R++){}return M(P[R])?Q[1]:Q[1].toUpperCase()},CHILD:function(P){if(P[1]=="nth"){var Q=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(P[2]=="even"&&"2n"||P[2]=="odd"&&"2n+1"||!/\D/.test(P[2])&&"0n+"+P[2]||P[2]);P[2]=(Q[1]+(Q[2]||1))-0;P[3]=Q[3]-0}P[0]="done"+(I++);return P},ATTR:function(Q){var P=Q[1];if(G.attrMap[P]){Q[1]=G.attrMap[P]}if(Q[2]==="~="){Q[4]=" "+Q[4]+" "}return Q},PSEUDO:function(T,Q,R,P,U){if(T[1]==="not"){if(T[3].match(N).length>1){T[3]=E(T[3],null,null,Q)}else{var S=E.filter(T[3],Q,R,true^U);if(!R){P.push.apply(P,S)}return false}}else{if(G.match.POS.test(T[0])){return true}}return T},POS:function(P){P.unshift(true);return P}},filters:{enabled:function(P){return P.disabled===false&&P.type!=="hidden"},disabled:function(P){return P.disabled===true},checked:function(P){return P.checked===true},selected:function(P){P.parentNode.selectedIndex;return P.selected===true},parent:function(P){return !!P.firstChild},empty:function(P){return !P.firstChild},has:function(R,Q,P){return !!E(P[3],R).length},header:function(P){return/h\d/i.test(P.nodeName)},text:function(P){return"text"===P.type},radio:function(P){return"radio"===P.type},checkbox:function(P){return"checkbox"===P.type},file:function(P){return"file"===P.type},password:function(P){return"password"===P.type},submit:function(P){return"submit"===P.type},image:function(P){return"image"===P.type},reset:function(P){return"reset"===P.type},button:function(P){return"button"===P.type||P.nodeName.toUpperCase()==="BUTTON"},input:function(P){return/input|select|textarea|button/i.test(P.nodeName)}},setFilters:{first:function(Q,P){return P===0},last:function(R,Q,P,S){return Q===S.length-1},even:function(Q,P){return P%2===0},odd:function(Q,P){return P%2===1},lt:function(R,Q,P){return Q<P[3]-0},gt:function(R,Q,P){return Q>P[3]-0},nth:function(R,Q,P){return P[3]-0==Q},eq:function(R,Q,P){return P[3]-0==Q}},filter:{CHILD:function(P,S){var V=S[1],W=P.parentNode;var U="child"+W.childNodes.length;if(W&&(!W[U]||!P.nodeIndex)){var T=1;for(var Q=W.firstChild;Q;Q=Q.nextSibling){if(Q.nodeType==1){Q.nodeIndex=T++}}W[U]=T-1}if(V=="first"){return P.nodeIndex==1}else{if(V=="last"){return P.nodeIndex==W[U]}else{if(V=="only"){return W[U]==1}else{if(V=="nth"){var Y=false,R=S[2],X=S[3];if(R==1&&X==0){return true}if(R==0){if(P.nodeIndex==X){Y=true}}else{if((P.nodeIndex-X)%R==0&&(P.nodeIndex-X)/R>=0){Y=true}}return Y}}}}},PSEUDO:function(V,R,S,W){var Q=R[1],T=G.filters[Q];if(T){return T(V,S,R,W)}else{if(Q==="contains"){return(V.textContent||V.innerText||"").indexOf(R[3])>=0}else{if(Q==="not"){var U=R[3];for(var S=0,P=U.length;S<P;S++){if(U[S]===V){return false}}return true}}}},ID:function(Q,P){return Q.nodeType===1&&Q.getAttribute("id")===P},TAG:function(Q,P){return(P==="*"&&Q.nodeType===1)||Q.nodeName===P},CLASS:function(Q,P){return P.test(Q.className)},ATTR:function(T,R){var P=G.attrHandle[R[1]]?G.attrHandle[R[1]](T):T[R[1]]||T.getAttribute(R[1]),U=P+"",S=R[2],Q=R[4];return P==null?false:S==="="?U===Q:S==="*="?U.indexOf(Q)>=0:S==="~="?(" "+U+" ").indexOf(Q)>=0:!R[4]?P:S==="!="?U!=Q:S==="^="?U.indexOf(Q)===0:S==="$="?U.substr(U.length-Q.length)===Q:S==="|="?U===Q||U.substr(0,Q.length+1)===Q+"-":false},POS:function(T,Q,R,U){var P=Q[2],S=G.setFilters[P];if(S){return S(T,R,Q,U)}}}};for(var K in G.match){G.match[K]=RegExp(G.match[K].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var D=function(Q,P){Q=Array.prototype.slice.call(Q);if(P){P.push.apply(P,Q);return P}return Q};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(J){D=function(T,S){var Q=S||[];if(F.call(T)==="[object Array]"){Array.prototype.push.apply(Q,T)}else{if(typeof T.length==="number"){for(var R=0,P=T.length;R<P;R++){Q.push(T[R])}}else{for(var R=0;T[R];R++){Q.push(T[R])}}}return Q}}(function(){var Q=document.createElement("form"),R="script"+(new Date).getTime();Q.innerHTML="<input name='"+R+"'/>";var P=document.documentElement;P.insertBefore(Q,P.firstChild);if(!!document.getElementById(R)){G.find.ID=function(T,U){if(U.getElementById){var S=U.getElementById(T[1]);return S?S.id===T[1]||S.getAttributeNode&&S.getAttributeNode("id").nodeValue===T[1]?[S]:g:[]}};G.filter.ID=function(U,S){var T=U.getAttributeNode&&U.getAttributeNode("id");return U.nodeType===1&&T&&T.nodeValue===S}}P.removeChild(Q)})();(function(){var P=document.createElement("div");P.appendChild(document.createComment(""));if(P.getElementsByTagName("*").length>0){G.find.TAG=function(Q,U){var T=U.getElementsByTagName(Q[1]);if(Q[1]==="*"){var S=[];for(var R=0;T[R];R++){if(T[R].nodeType===1){S.push(T[R])}}T=S}return T}}P.innerHTML="<a href='#'></a>";if(P.firstChild.getAttribute("href")!=="#"){G.attrHandle.href=function(Q){return Q.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var P=E;E=function(T,S,Q,R){S=S||document;if(!R&&S.nodeType===9){try{return D(S.querySelectorAll(T),Q)}catch(U){}}return P(T,S,Q,R)};E.find=P.find;E.filter=P.filter;E.selectors=P.selectors;E.matches=P.matches})()}if(document.documentElement.getElementsByClassName){G.order.splice(1,0,"CLASS");G.find.CLASS=function(P,Q){return Q.getElementsByClassName(P[1])}}function L(Q,W,V,Z,X,Y){for(var T=0,R=Z.length;T<R;T++){var P=Z[T];if(P){P=P[Q];var U=false;while(P&&P.nodeType){var S=P[V];if(S){U=Z[S];break}if(P.nodeType===1&&!Y){P[V]=T}if(P.nodeName===W){U=P;break}P=P[Q]}Z[T]=U}}}function O(Q,V,U,Y,W,X){for(var S=0,R=Y.length;S<R;S++){var P=Y[S];if(P){P=P[Q];var T=false;while(P&&P.nodeType){if(P[U]){T=Y[P[U]];break}if(P.nodeType===1){if(!X){P[U]=S}if(typeof V!=="string"){if(P===V){T=true;break}}else{if(E.filter(V,[P]).length>0){T=P;break}}}P=P[Q]}Y[S]=T}}}var H=document.compareDocumentPosition?function(Q,P){return Q.compareDocumentPosition(P)&16}:function(Q,P){return Q!==P&&(Q.contains?Q.contains(P):true)};var M=function(P){return P.documentElement&&!P.body||P.tagName&&P.ownerDocument&&!P.ownerDocument.body};n.find=E;n.filter=E.filter;n.expr=E.selectors;n.expr[":"]=n.expr.filters;E.selectors.filters.hidden=function(P){return"hidden"===P.type||n.css(P,"display")==="none"||n.css(P,"visibility")==="hidden"};E.selectors.filters.visible=function(P){return"hidden"!==P.type&&n.css(P,"display")!=="none"&&n.css(P,"visibility")!=="hidden"};E.selectors.filters.animated=function(P){return n.grep(n.timers,function(Q){return P===Q.elem}).length};n.multiFilter=function(R,P,Q){if(Q){R=":not("+R+")"}return E.matches(R,P)};n.dir=function(R,Q){var P=[],S=R[Q];while(S&&S!=document){if(S.nodeType==1){P.push(S)}S=S[Q]}return P};n.nth=function(T,P,R,S){P=P||1;var Q=0;for(;T;T=T[R]){if(T.nodeType==1&&++Q==P){break}}return T};n.sibling=function(R,Q){var P=[];for(;R;R=R.nextSibling){if(R.nodeType==1&&R!=Q){P.push(R)}}return P};return;l.Sizzle=E})();n.event={add:function(H,E,G,J){if(H.nodeType==3||H.nodeType==8){return}if(H.setInterval&&H!=l){H=l}if(!G.guid){G.guid=this.guid++}if(J!==g){var F=G;G=this.proxy(F);G.data=J}var D=n.data(H,"events")||n.data(H,"events",{}),I=n.data(H,"handle")||n.data(H,"handle",function(){return typeof n!=="undefined"&&!n.event.triggered?n.event.handle.apply(arguments.callee.elem,arguments):g});I.elem=H;n.each(E.split(/\s+/),function(L,M){var N=M.split(".");M=N.shift();G.type=N.slice().sort().join(".");var K=D[M];if(n.event.specialAll[M]){n.event.specialAll[M].setup.call(H,J,N)}if(!K){K=D[M]={};if(!n.event.special[M]||n.event.special[M].setup.call(H,J,N)===false){if(H.addEventListener){H.addEventListener(M,I,false)}else{if(H.attachEvent){H.attachEvent("on"+M,I)}}}}K[G.guid]=G;n.event.global[M]=true});H=null},guid:1,global:{},remove:function(J,G,I){if(J.nodeType==3||J.nodeType==8){return}var F=n.data(J,"events"),E,D;if(F){if(G===g||(typeof G==="string"&&G.charAt(0)==".")){for(var H in F){this.remove(J,H+(G||""))}}else{if(G.type){I=G.handler;G=G.type}n.each(G.split(/\s+/),function(L,N){var P=N.split(".");N=P.shift();var M=RegExp("(^|\\.)"+P.slice().sort().join(".*\\.")+"(\\.|$)");if(F[N]){if(I){delete F[N][I.guid]}else{for(var O in F[N]){if(M.test(F[N][O].type)){delete F[N][O]}}}if(n.event.specialAll[N]){n.event.specialAll[N].teardown.call(J,P)}for(E in F[N]){break}if(!E){if(!n.event.special[N]||n.event.special[N].teardown.call(J,P)===false){if(J.removeEventListener){J.removeEventListener(N,n.data(J,"handle"),false)}else{if(J.detachEvent){J.detachEvent("on"+N,n.data(J,"handle"))}}}E=null;delete F[N]}}})}for(E in F){break}if(!E){var K=n.data(J,"handle");if(K){K.elem=null}n.removeData(J,"events");n.removeData(J,"handle")}}},trigger:function(H,J,G,D){var F=H.type||H;if(!D){H=typeof H==="object"?H[h]?H:n.extend(n.Event(F),H):n.Event(F);if(F.indexOf("!")>=0){H.type=F=F.slice(0,-1);H.exclusive=true}if(!G){H.stopPropagation();if(this.global[F]){n.each(n.cache,function(){if(this.events&&this.events[F]){n.event.trigger(H,J,this.handle.elem)}})}}if(!G||G.nodeType==3||G.nodeType==8){return g}H.result=g;H.target=G;J=n.makeArray(J);J.unshift(H)}H.currentTarget=G;var I=n.data(G,"handle");if(I){I.apply(G,J)}if((!G[F]||(n.nodeName(G,"a")&&F=="click"))&&G["on"+F]&&G["on"+F].apply(G,J)===false){H.result=false}if(!D&&G[F]&&!H.isDefaultPrevented()&&!(n.nodeName(G,"a")&&F=="click")){this.triggered=true;try{G[F]()}catch(K){}}this.triggered=false;if(!H.isPropagationStopped()){var E=G.parentNode||G.ownerDocument;if(E){n.event.trigger(H,J,E,true)}}},handle:function(J){var I,D;J=arguments[0]=n.event.fix(J||l.event);var K=J.type.split(".");J.type=K.shift();I=!K.length&&!J.exclusive;var H=RegExp("(^|\\.)"+K.slice().sort().join(".*\\.")+"(\\.|$)");D=(n.data(this,"events")||{})[J.type];for(var F in D){var G=D[F];if(I||H.test(G.type)){J.handler=G;J.data=G.data;var E=G.apply(this,arguments);if(E!==g){J.result=E;if(E===false){J.preventDefault();J.stopPropagation()}}if(J.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(G){if(G[h]){return G}var E=G;G=n.Event(E);for(var F=this.props.length,I;F;){I=this.props[--F];G[I]=E[I]}if(!G.target){G.target=G.srcElement||document}if(G.target.nodeType==3){G.target=G.target.parentNode}if(!G.relatedTarget&&G.fromElement){G.relatedTarget=G.fromElement==G.target?G.toElement:G.fromElement}if(G.pageX==null&&G.clientX!=null){var H=document.documentElement,D=document.body;G.pageX=G.clientX+(H&&H.scrollLeft||D&&D.scrollLeft||0)-(H.clientLeft||0);G.pageY=G.clientY+(H&&H.scrollTop||D&&D.scrollTop||0)-(H.clientTop||0)}if(!G.which&&((G.charCode||G.charCode===0)?G.charCode:G.keyCode)){G.which=G.charCode||G.keyCode}if(!G.metaKey&&G.ctrlKey){G.metaKey=G.ctrlKey}if(!G.which&&G.button){G.which=(G.button&1?1:(G.button&2?3:(G.button&4?2:0)))}return G},proxy:function(E,D){D=D||function(){return E.apply(this,arguments)};D.guid=E.guid=E.guid||D.guid||this.guid++;return D},special:{ready:{setup:A,teardown:function(){}}},specialAll:{live:{setup:function(D,E){n.event.add(this,E[0],c)},teardown:function(F){if(F.length){var D=0,E=RegExp("(^|\\.)"+F[0]+"(\\.|$)");n.each((n.data(this,"events").live||{}),function(){if(E.test(this.type)){D++}});if(D<1){n.event.remove(this,F[0],c)}}}}}};n.Event=function(D){if(!this.preventDefault){return new n.Event(D)}if(D&&D.type){this.originalEvent=D;this.type=D.type;this.timeStamp=D.timeStamp}else{this.type=D}if(!this.timeStamp){this.timeStamp=e()}this[h]=true};function k(){return false}function t(){return true}n.Event.prototype={preventDefault:function(){this.isDefaultPrevented=t;var D=this.originalEvent;if(!D){return}if(D.preventDefault){D.preventDefault()}D.returnValue=false},stopPropagation:function(){this.isPropagationStopped=t;var D=this.originalEvent;if(!D){return}if(D.stopPropagation){D.stopPropagation()}D.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=t;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(E){var D=E.relatedTarget;while(D&&D!=this){try{D=D.parentNode}catch(F){D=this}}if(D!=this){E.type=E.data;n.event.handle.apply(this,arguments)}};n.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(E,D){n.event.special[D]={setup:function(){n.event.add(this,E,a,D)},teardown:function(){n.event.remove(this,E,a)}}});n.fn.extend({bind:function(E,F,D){return E=="unload"?this.one(E,F,D):this.each(function(){n.event.add(this,E,D||F,D&&F)})},one:function(F,G,E){var D=n.event.proxy(E||G,function(H){n(this).unbind(H,D);return(E||G).apply(this,arguments)});return this.each(function(){n.event.add(this,F,D,E&&G)})},unbind:function(E,D){return this.each(function(){n.event.remove(this,E,D)})},trigger:function(D,E){return this.each(function(){n.event.trigger(D,E,this)})},triggerHandler:function(D,F){if(this[0]){var E=n.Event(D);E.preventDefault();E.stopPropagation();n.event.trigger(E,F,this[0]);return E.result}},toggle:function(F){var D=arguments,E=1;while(E<D.length){n.event.proxy(F,D[E++])}return this.click(n.event.proxy(F,function(G){this.lastToggle=(this.lastToggle||0)%E;G.preventDefault();return D[this.lastToggle++].apply(this,arguments)||false}))},hover:function(D,E){return this.mouseenter(D).mouseleave(E)},ready:function(D){A();if(n.isReady){D.call(document,n)}else{n.readyList.push(D)}return this},live:function(F,E){var D=n.event.proxy(E);D.guid+=this.selector+F;n(document).bind(i(F,this.selector),this.selector,D);return this},die:function(E,D){n(document).unbind(i(E,this.selector),D?{guid:D.guid+this.selector+E}:null);return this}});function c(G){var D=RegExp("(^|\\.)"+G.type+"(\\.|$)"),F=true,E=[];n.each(n.data(this,"events").live||[],function(H,I){if(D.test(I.type)){var J=n(G.target).closest(I.data)[0];if(J){E.push({elem:J,fn:I})}}});n.each(E,function(){if(!G.isImmediatePropagationStopped()&&this.fn.call(this.elem,G,this.fn.data)===false){F=false}});return F}function i(E,D){return["live",E,D.replace(/\./g,"`").replace(/ /g,"|")].join(".")}n.extend({isReady:false,readyList:[],ready:function(){if(!n.isReady){n.isReady=true;if(n.readyList){n.each(n.readyList,function(){this.call(document,n)});n.readyList=null}n(document).triggerHandler("ready")}}});var w=false;function A(){if(w){return}w=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);n.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);n.ready()}});if(document.documentElement.doScroll&&!l.frameElement){(function(){if(n.isReady){return}try{document.documentElement.doScroll("left")}catch(D){setTimeout(arguments.callee,0);return}n.ready()})()}}}n.event.add(l,"load",n.ready)}n.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(E,D){n.fn[D]=function(F){return F?this.bind(D,F):this.trigger(D)}});n(l).bind("unload",function(){for(var D in n.cache){if(D!=1&&n.cache[D].handle){n.event.remove(n.cache[D].handle.elem)}}});(function(){n.support={};var E=document.documentElement,F=document.createElement("script"),J=document.createElement("div"),I="script"+(new Date).getTime();J.style.display="none";J.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var G=J.getElementsByTagName("*"),D=J.getElementsByTagName("a")[0];if(!G||!G.length||!D){return}n.support={leadingWhitespace:J.firstChild.nodeType==3,tbody:!J.getElementsByTagName("tbody").length,objectAll:!!J.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!J.getElementsByTagName("link").length,style:/red/.test(D.getAttribute("style")),hrefNormalized:D.getAttribute("href")==="/a",opacity:D.style.opacity==="0.5",cssFloat:!!D.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};F.type="text/javascript";try{F.appendChild(document.createTextNode("window."+I+"=1;"))}catch(H){}E.insertBefore(F,E.firstChild);if(l[I]){n.support.scriptEval=true;delete l[I]}E.removeChild(F);if(J.attachEvent&&J.fireEvent){J.attachEvent("onclick",function(){n.support.noCloneEvent=false;J.detachEvent("onclick",arguments.callee)});J.cloneNode(true).fireEvent("onclick")}n(function(){var K=document.createElement("div");K.style.width="1px";K.style.paddingLeft="1px";document.body.appendChild(K);n.boxModel=n.support.boxModel=K.offsetWidth===2;document.body.removeChild(K)})})();var v=n.support.cssFloat?"cssFloat":"styleFloat";n.props={"for":"htmlFor","class":"className","float":v,cssFloat:v,styleFloat:v,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};n.fn.extend({_load:n.fn.load,load:function(F,I,J){if(typeof F!=="string"){return this._load(F)}var H=F.indexOf(" ");if(H>=0){var D=F.slice(H,F.length);F=F.slice(0,H)}var G="GET";if(I){if(n.isFunction(I)){J=I;I=null}else{if(typeof I==="object"){I=n.param(I);G="POST"}}}var E=this;n.ajax({url:F,type:G,dataType:"html",data:I,complete:function(L,K){if(K=="success"||K=="notmodified"){E.html(D?n("<div/>").append(L.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(D):L.responseText)}if(J){E.each(J,[L.responseText,K,L])}}});return this},serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?n.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type))}).map(function(D,E){var F=n(this).val();return F==null?null:n.isArray(F)?n.map(F,function(H,G){return{name:E.name,value:H}}):{name:E.name,value:F}}).get()}});n.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(D,E){n.fn[E]=function(F){return this.bind(E,F)}});var q=e();n.extend({get:function(D,F,G,E){if(n.isFunction(F)){G=F;F=null}return n.ajax({type:"GET",url:D,data:F,success:G,dataType:E})},getScript:function(D,E){return n.get(D,null,E,"script")},getJSON:function(D,E,F){return n.get(D,E,F,"json")},post:function(D,F,G,E){if(n.isFunction(F)){G=F;F={}}return n.ajax({type:"POST",url:D,data:F,success:G,dataType:E})},ajaxSetup:function(D){n.extend(n.ajaxSettings,D)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(L){L=n.extend(true,L,n.extend(true,{},n.ajaxSettings,L));var V,E=/=\?(&|$)/g,Q,U,F=L.type.toUpperCase();if(L.data&&L.processData&&typeof L.data!=="string"){L.data=n.param(L.data)}if(L.dataType=="jsonp"){if(F=="GET"){if(!L.url.match(E)){L.url+=(L.url.match(/\?/)?"&":"?")+(L.jsonp||"callback")+"=?"}}else{if(!L.data||!L.data.match(E)){L.data=(L.data?L.data+"&":"")+(L.jsonp||"callback")+"=?"}}L.dataType="json"}if(L.dataType=="json"&&(L.data&&L.data.match(E)||L.url.match(E))){V="jsonp"+q++;if(L.data){L.data=(L.data+"").replace(E,"="+V+"$1")}L.url=L.url.replace(E,"="+V+"$1");L.dataType="script";l[V]=function(W){U=W;H();K();l[V]=g;try{delete l[V]}catch(X){}if(G){G.removeChild(S)}}}if(L.dataType=="script"&&L.cache==null){L.cache=false}if(L.cache===false&&F=="GET"){var D=e();var T=L.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+D+"$2");L.url=T+((T==L.url)?(L.url.match(/\?/)?"&":"?")+"_="+D:"")}if(L.data&&F=="GET"){L.url+=(L.url.match(/\?/)?"&":"?")+L.data;L.data=null}if(L.global&&!n.active++){n.event.trigger("ajaxStart")}var P=/^(\w+:)?\/\/([^\/?#]+)/.exec(L.url);if(L.dataType=="script"&&F=="GET"&&P&&(P[1]&&P[1]!=location.protocol||P[2]!=location.host)){var G=document.getElementsByTagName("head")[0];var S=document.createElement("script");S.src=L.url;if(L.scriptCharset){S.charset=L.scriptCharset}if(!V){var N=false;S.onload=S.onreadystatechange=function(){if(!N&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){N=true;H();K();G.removeChild(S)}}}G.appendChild(S);return g}var J=false;var I=L.xhr();if(L.username){I.open(F,L.url,L.async,L.username,L.password)}else{I.open(F,L.url,L.async)}try{if(L.data){I.setRequestHeader("Content-Type",L.contentType)}if(L.ifModified){I.setRequestHeader("If-Modified-Since",n.lastModified[L.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}I.setRequestHeader("X-Requested-With","XMLHttpRequest");I.setRequestHeader("Accept",L.dataType&&L.accepts[L.dataType]?L.accepts[L.dataType]+", */*":L.accepts._default)}catch(R){}if(L.beforeSend&&L.beforeSend(I,L)===false){if(L.global&&!--n.active){n.event.trigger("ajaxStop")}I.abort();return false}if(L.global){n.event.trigger("ajaxSend",[I,L])}var M=function(W){if(I.readyState==0){if(O){clearInterval(O);O=null;if(L.global&&!--n.active){n.event.trigger("ajaxStop")}}}else{if(!J&&I&&(I.readyState==4||W=="timeout")){J=true;if(O){clearInterval(O);O=null}Q=W=="timeout"?"timeout":!n.httpSuccess(I)?"error":L.ifModified&&n.httpNotModified(I,L.url)?"notmodified":"success";if(Q=="success"){try{U=n.httpData(I,L.dataType,L)}catch(Y){Q="parsererror"}}if(Q=="success"){var X;try{X=I.getResponseHeader("Last-Modified")}catch(Y){}if(L.ifModified&&X){n.lastModified[L.url]=X}if(!V){H()}}else{n.handleError(L,I,Q)}K();if(L.async){I=null}}}};if(L.async){var O=setInterval(M,13);if(L.timeout>0){setTimeout(function(){if(I){if(!J){M("timeout")}if(I){I.abort()}}},L.timeout)}}try{I.send(L.data)}catch(R){n.handleError(L,I,null,R)}if(!L.async){M()}function H(){if(L.success){L.success(U,Q)}if(L.global){n.event.trigger("ajaxSuccess",[I,L])}}function K(){if(L.complete){L.complete(I,Q)}if(L.global){n.event.trigger("ajaxComplete",[I,L])}if(L.global&&!--n.active){n.event.trigger("ajaxStop")}}return I},handleError:function(E,G,D,F){if(E.error){E.error(G,D,F)}if(E.global){n.event.trigger("ajaxError",[G,E,F])}},active:0,httpSuccess:function(E){try{return !E.status&&location.protocol=="file:"||(E.status>=200&&E.status<300)||E.status==304||E.status==1223}catch(D){}return false},httpNotModified:function(F,D){try{var G=F.getResponseHeader("Last-Modified");return F.status==304||G==n.lastModified[D]}catch(E){}return false},httpData:function(I,G,F){var E=I.getResponseHeader("content-type"),D=G=="xml"||!G&&E&&E.indexOf("xml")>=0,H=D?I.responseXML:I.responseText;if(D&&H.documentElement.tagName=="parsererror"){throw"parsererror"}if(F&&F.dataFilter){H=F.dataFilter(H,G)}if(typeof H==="string"){if(G=="script"){n.globalEval(H)}if(G=="json"){H=l["eval"]("("+H+")")}}return H},param:function(D){var F=[];function G(H,I){F[F.length]=encodeURIComponent(H)+"="+encodeURIComponent(I)}if(n.isArray(D)||D.jquery){n.each(D,function(){G(this.name,this.value)})}else{for(var E in D){if(n.isArray(D[E])){n.each(D[E],function(){G(E,this)})}else{G(E,n.isFunction(D[E])?D[E]():D[E])}}}return F.join("&").replace(/%20/g,"+")}});var m={},d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function s(E,D){var F={};n.each(d.concat.apply([],d.slice(0,D)),function(){F[this]=E});return F}n.fn.extend({show:function(I,K){if(I){return this.animate(s("show",3),I,K)}else{for(var G=0,E=this.length;G<E;G++){var D=n.data(this[G],"olddisplay");this[G].style.display=D||"";if(n.css(this[G],"display")==="none"){var F=this[G].tagName,J;if(m[F]){J=m[F]}else{var H=n("<"+F+" />").appendTo("body");J=H.css("display");if(J==="none"){J="block"}H.remove();m[F]=J}this[G].style.display=n.data(this[G],"olddisplay",J)}}return this}},hide:function(G,H){if(G){return this.animate(s("hide",3),G,H)}else{for(var F=0,E=this.length;F<E;F++){var D=n.data(this[F],"olddisplay");if(!D&&D!=="none"){n.data(this[F],"olddisplay",n.css(this[F],"display"))}this[F].style.display="none"}return this}},_toggle:n.fn.toggle,toggle:function(F,E){var D=typeof F==="boolean";return n.isFunction(F)&&n.isFunction(E)?this._toggle.apply(this,arguments):F==null||D?this.each(function(){var G=D?F:n(this).is(":hidden");n(this)[G?"show":"hide"]()}):this.animate(s("toggle",3),F,E)},fadeTo:function(D,F,E){return this.animate({opacity:F},D,E)},animate:function(H,E,G,F){var D=n.speed(E,G,F);return this[D.queue===false?"each":"queue"](function(){var J=n.extend({},D),L,K=this.nodeType==1&&n(this).is(":hidden"),I=this;for(L in H){if(H[L]=="hide"&&K||H[L]=="show"&&!K){return J.complete.call(this)}if((L=="height"||L=="width")&&this.style){J.display=n.css(this,"display");J.overflow=this.style.overflow}}if(J.overflow!=null){this.style.overflow="hidden"}J.curAnim=n.extend({},H);n.each(H,function(N,R){var Q=new n.fx(I,J,N);if(/toggle|show|hide/.test(R)){Q[R=="toggle"?K?"show":"hide":R](H)}else{var P=R.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),S=Q.cur(true)||0;if(P){var M=parseFloat(P[2]),O=P[3]||"px";if(O!="px"){I.style[N]=(M||1)+O;S=((M||1)/Q.cur(true))*S;I.style[N]=S+O}if(P[1]){M=((P[1]=="-="?-1:1)*M)+S}Q.custom(S,M,O)}else{Q.custom(S,R,"")}}});return true})},stop:function(E,D){var F=n.timers;if(E){this.queue([])}this.each(function(){for(var G=F.length-1;G>=0;G--){if(F[G].elem==this){if(D){F[G](true)}F.splice(G,1)}}});if(!D){this.dequeue()}return this}});n.each({slideDown:s("show",1),slideUp:s("hide",1),slideToggle:s("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(D,E){n.fn[D]=function(F,G){return this.animate(E,F,G)}});n.extend({speed:function(F,G,E){var D=typeof F==="object"?F:{complete:E||!E&&G||n.isFunction(F)&&F,duration:F,easing:E&&G||G&&!n.isFunction(G)&&G};D.duration=n.fx.off?0:typeof D.duration==="number"?D.duration:n.fx.speeds[D.duration]||n.fx.speeds._default;D.old=D.complete;D.complete=function(){if(D.queue!==false){n(this).dequeue()}if(n.isFunction(D.old)){D.old.call(this)}};return D},easing:{linear:function(F,G,D,E){return D+E*F},swing:function(F,G,D,E){return((-Math.cos(F*Math.PI)/2)+0.5)*E+D}},timers:[],timerId:null,fx:function(E,D,F){this.options=D;this.elem=E;this.prop=F;if(!D.orig){D.orig={}}}});n.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(n.fx.step[this.prop]||n.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(E){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var D=parseFloat(n.css(this.elem,this.prop,E));return D&&D>-10000?D:parseFloat(n.curCSS(this.elem,this.prop))||0},custom:function(H,G,F){this.startTime=e();this.start=H;this.end=G;this.unit=F||this.unit||"px";this.now=this.start;this.pos=this.state=0;var D=this;function E(I){return D.step(I)}E.elem=this.elem;n.timers.push(E);if(E()&&n.timerId==null){n.timerId=setInterval(function(){var J=n.timers;for(var I=0;I<J.length;I++){if(!J[I]()){J.splice(I--,1)}}if(!J.length){clearInterval(n.timerId);n.timerId=null}},13)}},show:function(){this.options.orig[this.prop]=n.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());n(this.elem).show()},hide:function(){this.options.orig[this.prop]=n.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(G){var F=e();if(G||F>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var D=true;for(var E in this.options.curAnim){if(this.options.curAnim[E]!==true){D=false}}if(D){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(n.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){n(this.elem).hide()}if(this.options.hide||this.options.show){for(var H in this.options.curAnim){n.attr(this.elem.style,H,this.options.orig[H])}}}if(D){this.options.complete.call(this.elem)}return false}else{var I=F-this.startTime;this.state=I/this.options.duration;this.pos=n.easing[this.options.easing||(n.easing.swing?"swing":"linear")](this.state,I,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};n.extend(n.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(D){n.attr(D.elem.style,"opacity",D.now)},_default:function(D){if(D.elem.style&&D.elem.style[D.prop]!=null){D.elem.style[D.prop]=D.now+D.unit}else{D.elem[D.prop]=D.now}}}});if(document.documentElement.getBoundingClientRect){n.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return n.offset.bodyOffset(this[0])}var F=this[0].getBoundingClientRect(),I=this[0].ownerDocument,E=I.body,D=I.documentElement,K=D.clientTop||E.clientTop||0,J=D.clientLeft||E.clientLeft||0,H=F.top+(self.pageYOffset||n.boxModel&&D.scrollTop||E.scrollTop)-K,G=F.left+(self.pageXOffset||n.boxModel&&D.scrollLeft||E.scrollLeft)-J;return{top:H,left:G}}}else{n.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return n.offset.bodyOffset(this[0])}n.offset.initialized||n.offset.initialize();var I=this[0],F=I.offsetParent,E=I,N=I.ownerDocument,L,G=N.documentElement,J=N.body,K=N.defaultView,D=K.getComputedStyle(I,null),M=I.offsetTop,H=I.offsetLeft;while((I=I.parentNode)&&I!==J&&I!==G){L=K.getComputedStyle(I,null);M-=I.scrollTop,H-=I.scrollLeft;if(I===F){M+=I.offsetTop,H+=I.offsetLeft;if(n.offset.doesNotAddBorder&&!(n.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(I.tagName))){M+=parseInt(L.borderTopWidth,10)||0,H+=parseInt(L.borderLeftWidth,10)||0}E=F,F=I.offsetParent}if(n.offset.subtractsBorderForOverflowNotVisible&&L.overflow!=="visible"){M+=parseInt(L.borderTopWidth,10)||0,H+=parseInt(L.borderLeftWidth,10)||0}D=L}if(D.position==="relative"||D.position==="static"){M+=J.offsetTop,H+=J.offsetLeft}if(D.position==="fixed"){M+=Math.max(G.scrollTop,J.scrollTop),H+=Math.max(G.scrollLeft,J.scrollLeft)}return{top:M,left:H}}}n.offset={initialize:function(){if(this.initialized){return}var K=document.body,E=document.createElement("div"),G,F,M,H,L,D,I=K.style.marginTop,J='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"cellpadding="0"cellspacing="0"><tr><td></td></tr></table>';L={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(D in L){E.style[D]=L[D]}E.innerHTML=J;K.insertBefore(E,K.firstChild);G=E.firstChild,F=G.firstChild,H=G.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(F.offsetTop!==5);this.doesAddBorderForTableAndCells=(H.offsetTop===5);G.style.overflow="hidden",G.style.position="relative";this.subtractsBorderForOverflowNotVisible=(F.offsetTop===-5);K.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(K.offsetTop===0);K.style.marginTop=I;K.removeChild(E);this.initialized=true},bodyOffset:function(D){n.offset.initialized||n.offset.initialize();var F=D.offsetTop,E=D.offsetLeft;if(n.offset.doesNotIncludeMarginInBodyOffset){F+=parseInt(n.curCSS(D,"marginTop",true),10)||0,E+=parseInt(n.curCSS(D,"marginLeft",true),10)||0}return{top:F,left:E}}};n.fn.extend({position:function(){var H=0,G=0,E;if(this[0]){var F=this.offsetParent(),I=this.offset(),D=/^body|html$/i.test(F[0].tagName)?{top:0,left:0}:F.offset();I.top-=j(this,"marginTop");I.left-=j(this,"marginLeft");D.top+=j(F,"borderTopWidth");D.left+=j(F,"borderLeftWidth");E={top:I.top-D.top,left:I.left-D.left}}return E},offsetParent:function(){var D=this[0].offsetParent||document.body;while(D&&(!/^body|html$/i.test(D.tagName)&&n.css(D,"position")=="static")){D=D.offsetParent}return n(D)}});n.each(["Left","Top"],function(E,D){var F="scroll"+D;n.fn[F]=function(G){if(!this[0]){return null}return G!==g?this.each(function(){this==l||this==document?l.scrollTo(!E?G:n(l).scrollLeft(),E?G:n(l).scrollTop()):this[F]=G}):this[0]==l||this[0]==document?self[E?"pageYOffset":"pageXOffset"]||n.boxModel&&document.documentElement[F]||document.body[F]:this[0][F]}});n.each(["Height","Width"],function(G,E){var D=G?"Left":"Top",F=G?"Right":"Bottom";n.fn["inner"+E]=function(){return this[E.toLowerCase()]()+j(this,"padding"+D)+j(this,"padding"+F)};n.fn["outer"+E]=function(I){return this["inner"+E]()+j(this,"border"+D+"Width")+j(this,"border"+F+"Width")+(I?j(this,"margin"+D)+j(this,"margin"+F):0)};var H=E.toLowerCase();n.fn[H]=function(I){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+E]||document.body["client"+E]:this[0]==document?Math.max(document.documentElement["client"+E],document.body["scroll"+E],document.documentElement["scroll"+E],document.body["offset"+E],document.documentElement["offset"+E]):I===g?(this.length?n.css(this[0],H):null):this.css(H,typeof I==="string"?I:I+"px")}})})();
\ No newline at end of file
+(function(){var Q=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]+['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g,K=0,G=Object.prototype.toString;var F=function(X,T,aa,ab){aa=aa||[];T=T||document;if(T.nodeType!==1&&T.nodeType!==9){return[]}if(!X||typeof X!=="string"){return aa}var Y=[],V,ae,ah,S,ac,U,W=true;Q.lastIndex=0;while((V=Q.exec(X))!==null){Y.push(V[1]);if(V[2]){U=RegExp.rightContext;break}}if(Y.length>1&&L.exec(X)){if(Y.length===2&&H.relative[Y[0]]){ae=I(Y[0]+Y[1],T)}else{ae=H.relative[Y[0]]?[T]:F(Y.shift(),T);while(Y.length){X=Y.shift();if(H.relative[X]){X+=Y.shift()}ae=I(X,ae)}}}else{var ad=ab?{expr:Y.pop(),set:E(ab)}:F.find(Y.pop(),Y.length===1&&T.parentNode?T.parentNode:T,P(T));ae=F.filter(ad.expr,ad.set);if(Y.length>0){ah=E(ae)}else{W=false}while(Y.length){var ag=Y.pop(),af=ag;if(!H.relative[ag]){ag=""}else{af=Y.pop()}if(af==null){af=T}H.relative[ag](ah,af,P(T))}}if(!ah){ah=ae}if(!ah){throw"Syntax error, unrecognized expression: "+(ag||X)}if(G.call(ah)==="[object Array]"){if(!W){aa.push.apply(aa,ah)}else{if(T.nodeType===1){for(var Z=0;ah[Z]!=null;Z++){if(ah[Z]&&(ah[Z]===true||ah[Z].nodeType===1&&J(T,ah[Z]))){aa.push(ae[Z])}}}else{for(var Z=0;ah[Z]!=null;Z++){if(ah[Z]&&ah[Z].nodeType===1){aa.push(ae[Z])}}}}}else{E(ah,aa)}if(U){F(U,T,aa,ab)}return aa};F.matches=function(S,T){return F(S,null,null,T)};F.find=function(Z,S,aa){var Y,W;if(!Z){return[]}for(var V=0,U=H.order.length;V<U;V++){var X=H.order[V],W;if((W=H.match[X].exec(Z))){var T=RegExp.leftContext;if(T.substr(T.length-1)!=="\\"){W[1]=(W[1]||"").replace(/\\/g,"");Y=H.find[X](W,S,aa);if(Y!=null){Z=Z.replace(H.match[X],"");break}}}}if(!Y){Y=S.getElementsByTagName("*")}return{set:Y,expr:Z}};F.filter=function(ab,aa,ae,V){var U=ab,ag=[],Y=aa,X,S;while(ab&&aa.length){for(var Z in H.filter){if((X=H.match[Z].exec(ab))!=null){var T=H.filter[Z],af,ad;S=false;if(Y==ag){ag=[]}if(H.preFilter[Z]){X=H.preFilter[Z](X,Y,ae,ag,V);if(!X){S=af=true}else{if(X===true){continue}}}if(X){for(var W=0;(ad=Y[W])!=null;W++){if(ad){af=T(ad,X,W,Y);var ac=V^!!af;if(ae&&af!=null){if(ac){S=true}else{Y[W]=false}}else{if(ac){ag.push(ad);S=true}}}}}if(af!==g){if(!ae){Y=ag}ab=ab.replace(H.match[Z],"");if(!S){return[]}break}}}ab=ab.replace(/\s*,\s*/,"");if(ab==U){if(S==null){throw"Syntax error, unrecognized expression: "+ab}else{break}}U=ab}return Y};var H=F.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(S){return S.getAttribute("href")}},relative:{"+":function(W,T){for(var U=0,S=W.length;U<S;U++){var V=W[U];if(V){var X=V.previousSibling;while(X&&X.nodeType!==1){X=X.previousSibling}W[U]=typeof T==="string"?X||false:X===T}}if(typeof T==="string"){F.filter(T,W,true)}},">":function(X,T,Y){if(typeof T==="string"&&!/\W/.test(T)){T=Y?T:T.toUpperCase();for(var U=0,S=X.length;U<S;U++){var W=X[U];if(W){var V=W.parentNode;X[U]=V.nodeName===T?V:false}}}else{for(var U=0,S=X.length;U<S;U++){var W=X[U];if(W){X[U]=typeof T==="string"?W.parentNode:W.parentNode===T}}if(typeof T==="string"){F.filter(T,X,true)}}},"":function(V,T,X){var U="done"+(K++),S=R;if(!T.match(/\W/)){var W=T=X?T:T.toUpperCase();S=O}S("parentNode",T,U,V,W,X)},"~":function(V,T,X){var U="done"+(K++),S=R;if(typeof T==="string"&&!T.match(/\W/)){var W=T=X?T:T.toUpperCase();S=O}S("previousSibling",T,U,V,W,X)}},find:{ID:function(T,U,V){if(typeof U.getElementById!=="undefined"&&!V){var S=U.getElementById(T[1]);return S?[S]:[]}},NAME:function(S,T,U){if(typeof T.getElementsByName!=="undefined"&&!U){return T.getElementsByName(S[1])}},TAG:function(S,T){return T.getElementsByTagName(S[1])}},preFilter:{CLASS:function(V,T,U,S,Y){V=" "+V[1].replace(/\\/g,"")+" ";var X;for(var W=0;(X=T[W])!=null;W++){if(X){if(Y^(" "+X.className+" ").indexOf(V)>=0){if(!U){S.push(X)}}else{if(U){T[W]=false}}}}return false},ID:function(S){return S[1].replace(/\\/g,"")},TAG:function(T,S){for(var U=0;S[U]===false;U++){}return S[U]&&P(S[U])?T[1]:T[1].toUpperCase()},CHILD:function(S){if(S[1]=="nth"){var T=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(S[2]=="even"&&"2n"||S[2]=="odd"&&"2n+1"||!/\D/.test(S[2])&&"0n+"+S[2]||S[2]);S[2]=(T[1]+(T[2]||1))-0;S[3]=T[3]-0}S[0]="done"+(K++);return S},ATTR:function(T){var S=T[1].replace(/\\/g,"");if(H.attrMap[S]){T[1]=H.attrMap[S]}if(T[2]==="~="){T[4]=" "+T[4]+" "}return T},PSEUDO:function(W,T,U,S,X){if(W[1]==="not"){if(W[3].match(Q).length>1){W[3]=F(W[3],null,null,T)}else{var V=F.filter(W[3],T,U,true^X);if(!U){S.push.apply(S,V)}return false}}else{if(H.match.POS.test(W[0])){return true}}return W},POS:function(S){S.unshift(true);return S}},filters:{enabled:function(S){return S.disabled===false&&S.type!=="hidden"},disabled:function(S){return S.disabled===true},checked:function(S){return S.checked===true},selected:function(S){S.parentNode.selectedIndex;return S.selected===true},parent:function(S){return !!S.firstChild},empty:function(S){return !S.firstChild},has:function(U,T,S){return !!F(S[3],U).length},header:function(S){return/h\d/i.test(S.nodeName)},text:function(S){return"text"===S.type},radio:function(S){return"radio"===S.type},checkbox:function(S){return"checkbox"===S.type},file:function(S){return"file"===S.type},password:function(S){return"password"===S.type},submit:function(S){return"submit"===S.type},image:function(S){return"image"===S.type},reset:function(S){return"reset"===S.type},button:function(S){return"button"===S.type||S.nodeName.toUpperCase()==="BUTTON"},input:function(S){return/input|select|textarea|button/i.test(S.nodeName)}},setFilters:{first:function(T,S){return S===0},last:function(U,T,S,V){return T===V.length-1},even:function(T,S){return S%2===0},odd:function(T,S){return S%2===1},lt:function(U,T,S){return T<S[3]-0},gt:function(U,T,S){return T>S[3]-0},nth:function(U,T,S){return S[3]-0==T},eq:function(U,T,S){return S[3]-0==T}},filter:{CHILD:function(S,V){var Y=V[1],Z=S.parentNode;var X=V[0];if(Z&&(!Z[X]||!S.nodeIndex)){var W=1;for(var T=Z.firstChild;T;T=T.nextSibling){if(T.nodeType==1){T.nodeIndex=W++}}Z[X]=W-1}if(Y=="first"){return S.nodeIndex==1}else{if(Y=="last"){return S.nodeIndex==Z[X]}else{if(Y=="only"){return Z[X]==1}else{if(Y=="nth"){var ab=false,U=V[2],aa=V[3];if(U==1&&aa==0){return true}if(U==0){if(S.nodeIndex==aa){ab=true}}else{if((S.nodeIndex-aa)%U==0&&(S.nodeIndex-aa)/U>=0){ab=true}}return ab}}}}},PSEUDO:function(Y,U,V,Z){var T=U[1],W=H.filters[T];if(W){return W(Y,V,U,Z)}else{if(T==="contains"){return(Y.textContent||Y.innerText||"").indexOf(U[3])>=0}else{if(T==="not"){var X=U[3];for(var V=0,S=X.length;V<S;V++){if(X[V]===Y){return false}}return true}}}},ID:function(T,S){return T.nodeType===1&&T.getAttribute("id")===S},TAG:function(T,S){return(S==="*"&&T.nodeType===1)||T.nodeName===S},CLASS:function(T,S){return S.test(T.className)},ATTR:function(W,U){var S=H.attrHandle[U[1]]?H.attrHandle[U[1]](W):W[U[1]]||W.getAttribute(U[1]),X=S+"",V=U[2],T=U[4];return S==null?V==="!=":V==="="?X===T:V==="*="?X.indexOf(T)>=0:V==="~="?(" "+X+" ").indexOf(T)>=0:!U[4]?S:V==="!="?X!=T:V==="^="?X.indexOf(T)===0:V==="$="?X.substr(X.length-T.length)===T:V==="|="?X===T||X.substr(0,T.length+1)===T+"-":false},POS:function(W,T,U,X){var S=T[2],V=H.setFilters[S];if(V){return V(W,U,T,X)}}}};var L=H.match.POS;for(var N in H.match){H.match[N]=RegExp(H.match[N].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(T,S){T=Array.prototype.slice.call(T);if(S){S.push.apply(S,T);return S}return T};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(M){E=function(W,V){var T=V||[];if(G.call(W)==="[object Array]"){Array.prototype.push.apply(T,W)}else{if(typeof W.length==="number"){for(var U=0,S=W.length;U<S;U++){T.push(W[U])}}else{for(var U=0;W[U];U++){T.push(W[U])}}}return T}}(function(){var T=document.createElement("form"),U="script"+(new Date).getTime();T.innerHTML="<input name='"+U+"'/>";var S=document.documentElement;S.insertBefore(T,S.firstChild);if(!!document.getElementById(U)){H.find.ID=function(W,X,Y){if(typeof X.getElementById!=="undefined"&&!Y){var V=X.getElementById(W[1]);return V?V.id===W[1]||typeof V.getAttributeNode!=="undefined"&&V.getAttributeNode("id").nodeValue===W[1]?[V]:g:[]}};H.filter.ID=function(X,V){var W=typeof X.getAttributeNode!=="undefined"&&X.getAttributeNode("id");return X.nodeType===1&&W&&W.nodeValue===V}}S.removeChild(T)})();(function(){var S=document.createElement("div");S.appendChild(document.createComment(""));if(S.getElementsByTagName("*").length>0){H.find.TAG=function(T,X){var W=X.getElementsByTagName(T[1]);if(T[1]==="*"){var V=[];for(var U=0;W[U];U++){if(W[U].nodeType===1){V.push(W[U])}}W=V}return W}}S.innerHTML="<a href='#'></a>";if(S.firstChild&&S.firstChild.getAttribute("href")!=="#"){H.attrHandle.href=function(T){return T.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var S=F,T=document.createElement("div");T.innerHTML="<p class='TEST'></p>";if(T.querySelectorAll&&T.querySelectorAll(".TEST").length===0){return}F=function(X,W,U,V){W=W||document;if(!V&&W.nodeType===9&&!P(W)){try{return E(W.querySelectorAll(X),U)}catch(Y){}}return S(X,W,U,V)};F.find=S.find;F.filter=S.filter;F.selectors=S.selectors;F.matches=S.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){H.order.splice(1,0,"CLASS");H.find.CLASS=function(S,T){return T.getElementsByClassName(S[1])}}function O(T,Z,Y,ac,aa,ab){for(var W=0,U=ac.length;W<U;W++){var S=ac[W];if(S){S=S[T];var X=false;while(S&&S.nodeType){var V=S[Y];if(V){X=ac[V];break}if(S.nodeType===1&&!ab){S[Y]=W}if(S.nodeName===Z){X=S;break}S=S[T]}ac[W]=X}}}function R(T,Y,X,ab,Z,aa){for(var V=0,U=ab.length;V<U;V++){var S=ab[V];if(S){S=S[T];var W=false;while(S&&S.nodeType){if(S[X]){W=ab[S[X]];break}if(S.nodeType===1){if(!aa){S[X]=V}if(typeof Y!=="string"){if(S===Y){W=true;break}}else{if(F.filter(Y,[S]).length>0){W=S;break}}}S=S[T]}ab[V]=W}}}var J=document.compareDocumentPosition?function(T,S){return T.compareDocumentPosition(S)&16}:function(T,S){return T!==S&&(T.contains?T.contains(S):true)};var P=function(S){return S.nodeType===9&&S.documentElement.nodeName!=="HTML"||!!S.ownerDocument&&P(S.ownerDocument)};var I=function(S,Z){var V=[],W="",X,U=Z.nodeType?[Z]:Z;while((X=H.match.PSEUDO.exec(S))){W+=X[0];S=S.replace(H.match.PSEUDO,"")}S=H.relative[S]?S+"*":S;for(var Y=0,T=U.length;Y<T;Y++){F(S,U[Y],V)}return F.filter(W,V)};o.find=F;o.filter=F.filter;o.expr=F.selectors;o.expr[":"]=o.expr.filters;F.selectors.filters.hidden=function(S){return"hidden"===S.type||o.css(S,"display")==="none"||o.css(S,"visibility")==="hidden"};F.selectors.filters.visible=function(S){return"hidden"!==S.type&&o.css(S,"display")!=="none"&&o.css(S,"visibility")!=="hidden"};F.selectors.filters.animated=function(S){return o.grep(o.timers,function(T){return S===T.elem}).length};o.multiFilter=function(U,S,T){if(T){U=":not("+U+")"}return F.matches(U,S)};o.dir=function(U,T){var S=[],V=U[T];while(V&&V!=document){if(V.nodeType==1){S.push(V)}V=V[T]}return S};o.nth=function(W,S,U,V){S=S||1;var T=0;for(;W;W=W[U]){if(W.nodeType==1&&++T==S){break}}return W};o.sibling=function(U,T){var S=[];for(;U;U=U.nextSibling){if(U.nodeType==1&&U!=T){S.push(U)}}return S};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F<E.length){o.event.proxy(G,E[F++])}return this.click(o.event.proxy(G,function(H){this.lastToggle=(this.lastToggle||0)%F;H.preventDefault();return E[this.lastToggle++].apply(this,arguments)||false}))},hover:function(E,F){return this.mouseenter(E).mouseleave(F)},ready:function(E){B();if(o.isReady){E.call(document,o)}else{o.readyList.push(E)}return this},live:function(G,F){var E=o.event.proxy(F);E.guid+=this.selector+G;o(document).bind(i(G,this.selector),this.selector,E);return this},die:function(F,E){o(document).unbind(i(F,this.selector),E?{guid:E.guid+this.selector+F}:null);return this}});function c(H){var E=RegExp("(^|\\.)"+H.type+"(\\.|$)"),G=true,F=[];o.each(o.data(this,"events").live||[],function(I,J){if(E.test(J.type)){var K=o(H.target).closest(J.data)[0];if(K){F.push({elem:K,fn:J})}}});o.each(F,function(){if(this.fn.call(this.elem,H,this.fn.data)===false){G=false}});return G}function i(F,E){return["live",F,E.replace(/\./g,"`").replace(/ /g,"|")].join(".")}o.extend({isReady:false,readyList:[],ready:function(){if(!o.isReady){o.isReady=true;if(o.readyList){o.each(o.readyList,function(){this.call(document,o)});o.readyList=null}o(document).triggerHandler("ready")}}});var x=false;function B(){if(x){return}x=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);o.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);o.ready()}});if(document.documentElement.doScroll&&typeof l.frameElement==="undefined"){(function(){if(o.isReady){return}try{document.documentElement.doScroll("left")}catch(E){setTimeout(arguments.callee,0);return}o.ready()})()}}}o.event.add(l,"load",o.ready)}o.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(F,E){o.fn[E]=function(G){return G?this.bind(E,G):this.trigger(E)}});o(l).bind("unload",function(){for(var E in o.cache){if(E!=1&&o.cache[E].handle){o.event.remove(o.cache[E].handle.elem)}}});(function(){o.support={};var F=document.documentElement,G=document.createElement("script"),K=document.createElement("div"),J="script"+(new Date).getTime();K.style.display="none";K.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var H=K.getElementsByTagName("*"),E=K.getElementsByTagName("a")[0];if(!H||!H.length||!E){return}o.support={leadingWhitespace:K.firstChild.nodeType==3,tbody:!K.getElementsByTagName("tbody").length,objectAll:!!K.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!K.getElementsByTagName("link").length,style:/red/.test(E.getAttribute("style")),hrefNormalized:E.getAttribute("href")==="/a",opacity:E.style.opacity==="0.5",cssFloat:!!E.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};G.type="text/javascript";try{G.appendChild(document.createTextNode("window."+J+"=1;"))}catch(I){}F.insertBefore(G,F.firstChild);if(l[J]){o.support.scriptEval=true;delete l[J]}F.removeChild(G);if(K.attachEvent&&K.fireEvent){K.attachEvent("onclick",function(){o.support.noCloneEvent=false;K.detachEvent("onclick",arguments.callee)});K.cloneNode(true).fireEvent("onclick")}o(function(){var L=document.createElement("div");L.style.width="1px";L.style.paddingLeft="1px";document.body.appendChild(L);o.boxModel=o.support.boxModel=L.offsetWidth===2;document.body.removeChild(L)})})();var w=o.support.cssFloat?"cssFloat":"styleFloat";o.props={"for":"htmlFor","class":"className","float":w,cssFloat:w,styleFloat:w,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};o.fn.extend({_load:o.fn.load,load:function(G,J,K){if(typeof G!=="string"){return this._load(G)}var I=G.indexOf(" ");if(I>=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("<div/>").append(M.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H<F;H++){var E=o.data(this[H],"olddisplay");this[H].style.display=E||"";if(o.css(this[H],"display")==="none"){var G=this[H].tagName,K;if(m[G]){K=m[G]}else{var I=o("<"+G+" />").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}this[H].style.display=o.data(this[H],"olddisplay",K)}}return this}},hide:function(H,I){if(H){return this.animate(t("hide",3),H,I)}else{for(var G=0,F=this.length;G<F;G++){var E=o.data(this[G],"olddisplay");if(!E&&E!=="none"){o.data(this[G],"olddisplay",o.css(this[G],"display"))}this[G].style.display="none"}return this}},_toggle:o.fn.toggle,toggle:function(G,F){var E=typeof G==="boolean";return o.isFunction(G)&&o.isFunction(F)?this._toggle.apply(this,arguments):G==null||E?this.each(function(){var H=E?G:o(this).is(":hidden");o(this)[H?"show":"hide"]()}):this.animate(t("toggle",3),G,F)},fadeTo:function(E,G,F){return this.animate({opacity:G},E,F)},animate:function(I,F,H,G){var E=o.speed(F,H,G);return this[E.queue===false?"each":"queue"](function(){var K=o.extend({},E),M,L=this.nodeType==1&&o(this).is(":hidden"),J=this;for(M in I){if(I[M]=="hide"&&L||I[M]=="show"&&!L){return K.complete.call(this)}if((M=="height"||M=="width")&&this.style){K.display=o.css(this,"display");K.overflow=this.style.overflow}}if(K.overflow!=null){this.style.overflow="hidden"}K.curAnim=o.extend({},I);o.each(I,function(O,S){var R=new o.fx(J,K,O);if(/toggle|show|hide/.test(S)){R[S=="toggle"?L?"show":"hide":S](I)}else{var Q=S.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),T=R.cur(true)||0;if(Q){var N=parseFloat(Q[2]),P=Q[3]||"px";if(P!="px"){J.style[O]=(N||1)+P;T=((N||1)/R.cur(true))*T;J.style[O]=T+P}if(Q[1]){N=((Q[1]=="-="?-1:1)*N)+T}R.custom(T,N,P)}else{R.custom(T,S,"")}}});return true})},stop:function(F,E){var G=o.timers;if(F){this.queue([])}this.each(function(){for(var H=G.length-1;H>=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)==1){n=setInterval(function(){var K=o.timers;for(var J=0;J<K.length;J++){if(!K[J]()){K.splice(J--,1)}}if(!K.length){clearInterval(n)}},13)}},show:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());o(this.elem).show()},hide:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(H){var G=e();if(H||G>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(H,F){var E=H?"Left":"Top",G=H?"Right":"Bottom";o.fn["inner"+F]=function(){return this[F.toLowerCase()]()+j(this,"padding"+E)+j(this,"padding"+G)};o.fn["outer"+F]=function(J){return this["inner"+F]()+j(this,"border"+E+"Width")+j(this,"border"+G+"Width")+(J?j(this,"margin"+E)+j(this,"margin"+G):0)};var I=F.toLowerCase();o.fn[I]=function(J){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+F]||document.body["client"+F]:this[0]==document?Math.max(document.documentElement["client"+F],document.body["scroll"+F],document.documentElement["scroll"+F],document.body["offset"+F],document.documentElement["offset"+F]):J===g?(this.length?o.css(this[0],I):null):this.css(I,typeof J==="string"?J:J+"px")}})})();
\ No newline at end of file
diff --git a/js/jquery.simplemodal-1.2.2.pack.js b/js/jquery.simplemodal-1.2.2.pack.js
new file mode 100644
index 000000000..b5ad5c23a
--- /dev/null
+++ b/js/jquery.simplemodal-1.2.2.pack.js
@@ -0,0 +1,8 @@
+/*
+ * SimpleModal 1.2.2 - jQuery Plugin
+ * http://www.ericmmartin.com/projects/simplemodal/
+ * Copyright (c) 2008 Eric Martin
+ * Dual licensed under the MIT and GPL licenses
+ * Revision: $Id: jquery.simplemodal.js 181 2008-12-16 16:51:44Z emartin24 $
+ */
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(g($){m f=$.Q.1Q&&1a($.Q.1D)==6&&!10[\'2g\'],1f=$.Q.1Q&&!$.2a,w=[];$.y=g(a,b){I $.y.12.1n(a,b)};$.y.D=g(){$.y.12.D()};$.1P.y=g(a){I $.y.12.1n(3,a)};$.y.1O={V:29,1J:\'r-H\',1B:{},1z:\'r-n\',20:{},1Z:{},v:2t,D:1o,1T:\'<a 2j="2h" 2f="2e"></a>\',X:\'r-D\',l:F,1g:K,1e:F,1d:F,1c:F};$.y.12={7:F,4:{},1n:g(a,b){8(3.4.j){I K}3.7=$.U({},$.y.1O,b);3.v=3.7.v;3.1w=K;8(J a==\'27\'){a=a 25 1A?a:$(a);8(a.1v().1v().23()>0){3.4.T=a.1v();8(!3.7.1g){3.4.21=a.2x(1o)}}}q 8(J a==\'2w\'||J a==\'1r\'){a=$(\'<1q/>\').2s(a)}q{2r(\'2q 2p: 2o j 2l: \'+J a);I K}3.4.j=a.11(\'r-j\').E(3.7.1Z);a=F;3.1S();3.1R();8($.1m(3.7.1d)){3.7.1d.1l(3,[3.4])}I 3},1S:g(){w=3.1k();8(f){3.4.x=$(\'<x 2d="2c:K;"/>\').E($.U(3.7.2b,{1j:\'1i\',V:0,l:\'1h\',A:w[0],z:w[1],v:3.7.v,L:0,B:0})).O(\'u\')}3.4.H=$(\'<1q/>\').1N(\'1M\',3.7.1J).11(\'r-H\').E($.U(3.7.1B,{1j:\'1i\',V:3.7.V/1b,A:w[0],z:w[1],l:\'1h\',B:0,L:0,v:3.7.v+1})).O(\'u\');3.4.n=$(\'<1q/>\').1N(\'1M\',3.7.1z).11(\'r-n\').E($.U(3.7.20,{1j:\'1i\',l:\'1h\',v:3.7.v+2})).1K(3.7.D?$(3.7.1T).11(3.7.X):\'\').O(\'u\');3.19();8(f||1f){3.18()}3.4.n.1K(3.4.j.1I())},1H:g(){m a=3;$(\'.\'+3.7.X).1G(\'1L.r\',g(e){e.28();a.D()});$(10).1G(\'1F.r\',g(){w=a.1k();a.19();8(f||1f){a.18()}q{a.4.x&&a.4.x.E({A:w[0],z:w[1]});a.4.H.E({A:w[0],z:w[1]})}})},1E:g(){$(\'.\'+3.7.X).1C(\'1L.r\');$(10).1C(\'1F.r\')},18:g(){m p=3.7.l;$.26([3.4.x||F,3.4.H,3.4.n],g(i,e){8(e){m a=\'k.u.17\',N=\'k.u.1W\',16=\'k.u.24\',S=\'k.u.1y\',R=\'k.u.1x\',15=\'k.u.22\',1t=\'k.P.17\',1s=\'k.P.1W\',C=\'k.P.1y\',G=\'k.P.1x\',s=e[0].2v;s.l=\'2u\';8(i<2){s.14(\'A\');s.14(\'z\');s.Z(\'A\',\'\'+16+\' > \'+a+\' ? \'+16+\' : \'+a+\' + "o"\');s.Z(\'z\',\'\'+15+\' > \'+N+\' ? \'+15+\' : \'+N+\' + "o"\')}q{m b,W;8(p&&p.1Y==1X){8(p[0]){m c=J p[0]==\'1r\'?p[0].1V():p[0].13(/o/,\'\');b=c.1U(\'%\')==-1?c+\' + (t = \'+G+\' ? \'+G+\' : \'+R+\') + "o"\':1a(c.13(/%/,\'\'))+\' * ((\'+1t+\' || \'+a+\') / 1b) + (t = \'+G+\' ? \'+G+\' : \'+R+\') + "o"\'}8(p[1]){m d=J p[1]==\'1r\'?p[1].1V():p[1].13(/o/,\'\');W=d.1U(\'%\')==-1?d+\' + (t = \'+C+\' ? \'+C+\' : \'+S+\') + "o"\':1a(d.13(/%/,\'\'))+\' * ((\'+1s+\' || \'+N+\') / 1b) + (t = \'+C+\' ? \'+C+\' : \'+S+\') + "o"\'}}q{b=\'(\'+1t+\' || \'+a+\') / 2 - (3.2n / 2) + (t = \'+G+\' ? \'+G+\' : \'+R+\') + "o"\';W=\'(\'+1s+\' || \'+N+\') / 2 - (3.2m / 2) + (t = \'+C+\' ? \'+C+\' : \'+S+\') + "o"\'}s.14(\'L\');s.14(\'B\');s.Z(\'L\',b);s.Z(\'B\',W)}}})},1k:g(){m a=$(10);m h=$.Q.2k&&$.Q.1D>\'9.5\'&&$.1P.2i<=\'1.2.6\'?k.P[\'17\']:a.A();I[h,a.z()]},19:g(){m a,B,1u=(w[0]/2)-((3.4.n.A()||3.4.j.A())/2),1p=(w[1]/2)-((3.4.n.z()||3.4.j.z())/2);8(3.7.l&&3.7.l.1Y==1X){a=3.7.l[0]||1u;B=3.7.l[1]||1p}q{a=1u;B=1p}3.4.n.E({B:B,L:a})},1R:g(){3.4.x&&3.4.x.Y();8($.1m(3.7.1e)){3.7.1e.1l(3,[3.4])}q{3.4.H.Y();3.4.n.Y();3.4.j.Y()}3.1H()},D:g(){8(!3.4.j){I K}8($.1m(3.7.1c)&&!3.1w){3.1w=1o;3.7.1c.1l(3,[3.4])}q{8(3.4.T){8(3.7.1g){3.4.j.1I().O(3.4.T)}q{3.4.j.M();3.4.21.O(3.4.T)}}q{3.4.j.M()}3.4.n.M();3.4.H.M();3.4.x&&3.4.x.M();3.4={}}3.1E()}}})(1A);',62,158,'|||this|dialog|||opts|if||||||||function|||data|document|position|var|container|px||else|simplemodal|||body|zIndex||iframe|modal|width|height|left|sl|close|css|null|st|overlay|return|typeof|false|top|remove|bcw|appendTo|documentElement|browser|bst|bsl|parentNode|extend|opacity|le|closeClass|show|setExpression|window|addClass|impl|replace|removeExpression|bsw|bsh|clientHeight|fixIE|setPosition|parseInt|100|onClose|onShow|onOpen|ieQuirks|persist|fixed|none|display|getDimensions|apply|isFunction|init|true|vCenter|div|number|cw|ch|hCenter|parent|occb|scrollTop|scrollLeft|containerId|jQuery|overlayCss|unbind|version|unbindEvents|resize|bind|bindEvents|hide|overlayId|append|click|id|attr|defaults|fn|msie|open|create|closeHTML|indexOf|toString|clientWidth|Array|constructor|dataCss|containerCss|orig|scrollWidth|size|scrollHeight|instanceof|each|object|preventDefault|50|boxModel|iframeCss|javascript|src|Close|title|XMLHttpRequest|modalCloseImg|jquery|class|opera|type|offsetWidth|offsetHeight|Unsupported|Error|SimpleModal|alert|html|1000|absolute|style|string|clone'.split('|'),0,{}))
\ No newline at end of file
diff --git a/js/util.js b/js/util.js
index 391e4653d..3ad038612 100644
--- a/js/util.js
+++ b/js/util.js
@@ -202,14 +202,16 @@ function NoticeHover() {
 }
 
 function NoticeReply() {
-    $('#content .notice').each(function() {
-        var notice = $(this);
-        $('.notice_reply', $(this)).click(function() {
-            var nickname = ($('.author .nickname', notice).length > 0) ? $('.author .nickname', notice) : $('.author .nickname');
-            NoticeReplySet(nickname.text(), $('.notice_id', notice).text());
-            return false;
+    if ($('#notice_data-text').length > 0) {
+        $('#content .notice').each(function() {
+            var notice = $(this);
+            $('.notice_reply', $(this)).click(function() {
+                var nickname = ($('.author .nickname', notice).length > 0) ? $('.author .nickname', notice) : $('.author .nickname');
+                NoticeReplySet(nickname.text(), $('.notice_id', notice).text());
+                return false;
+            });
         });
-    });
+    }
 }
 
 function NoticeReplySet(nick,id) {
diff --git a/js/video.js b/js/video.js
new file mode 100644
index 000000000..936a6312e
--- /dev/null
+++ b/js/video.js
@@ -0,0 +1,9 @@
+$('document').ready(function() {
+    $('a.media, a.mediamp3').append(' <sup>[PLAY]</sup>');
+    $('a.mediamp3').html('').css('display', 'block').css('width', '224px').css('height','24px').flowplayer('../bin/flowplayer-3.0.5.swf');
+    $('a.media').click(function() {
+        $('<a id="p1i"></a>').attr('href', $(this).attr('href')).flowplayer('../bin/flowplayer-3.0.5.swf').modal({'closeHTML':'<a class="modalCloseImg" title="Close"><img src="x.png" /></a>'});
+        return false;
+    });
+});
+
diff --git a/lib/action.php b/lib/action.php
index 8f02b36bf..812df635e 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -73,7 +73,6 @@ class Action extends HTMLOutputter // lawsuit
         parent::__construct($output, $indent);
     }
 
-
     /**
      * For initializing members of the class.
      *
@@ -94,7 +93,10 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showPage()
     {
-        $this->startHTML();
+        if (Event::handle('StartShowHTML', array($this))) {
+            $this->startHTML();
+            Event::handle('EndShowHTML', array($this));
+        }
         $this->showHead();
         $this->showBody();
         $this->endHTML();
@@ -152,22 +154,49 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showStylesheets()
     {
-        $this->element('link', array('rel' => 'stylesheet',
-                                     'type' => 'text/css',
-                                     'href' => theme_path('css/display.css', 'base') . '?version=' . LACONICA_VERSION,
-                                     'media' => 'screen, projection, tv'));
-        $this->element('link', array('rel' => 'stylesheet',
-                                     'type' => 'text/css',
-                                     'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,
-                                     'media' => 'screen, projection, tv'));
-        $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
-                       'href="'.theme_path('css/ie.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]');
-        foreach (array(6,7) as $ver) {
-            if (file_exists(theme_file('ie'.$ver.'.css'))) {
-                // 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='.LACONICA_VERSION.'" /><![endif]');
+        if (Event::handle('StartShowStyles', array($this))) {
+            if (Event::handle('StartShowLaconicaStyles', array($this))) {
+
+                $this->element('link', array('rel' => 'stylesheet',
+                                             'type' => 'text/css',
+                                             'href' => theme_path('css/display.css', 'base') . '?version=' . LACONICA_VERSION,
+                                             'media' => 'screen, projection, tv'));
+                $this->element('link', array('rel' => 'stylesheet',
+                                             'type' => 'text/css',
+                                             'href' => theme_path('css/modal.css', 'base') . '?version=' . LACONICA_VERSION,
+                                             'media' => 'screen, projection, tv'));
+                $this->element('link', array('rel' => 'stylesheet',
+                                             'type' => 'text/css',
+                                             'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,
+                                             'media' => 'screen, projection, tv'));
+                if (common_config('site', 'mobile')) {
+                    $this->element('link', array('rel' => 'stylesheet',
+                                                 'type' => 'text/css',
+                                                 'href' => theme_path('css/mobile.css', 'base') . '?version=' . LACONICA_VERSION,
+                                                 // TODO: "handheld" CSS for other mobile devices
+                                                 'media' => 'only screen and (max-device-width: 480px)')); // Mobile WebKit
+                }
+                $this->element('link', array('rel' => 'stylesheet',
+                                             'type' => 'text/css',
+                                             'href' => theme_path('css/print.css', 'base') . '?version=' . LACONICA_VERSION,
+                                             'media' => 'print'));
+                Event::handle('EndShowLaconicaStyles', array($this));
             }
+            if (Event::handle('StartShowUAStyles', array($this))) {
+                $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
+                               'href="'.theme_path('css/ie.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]');
+                foreach (array(6,7) as $ver) {
+                    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='.LACONICA_VERSION.'" /><![endif]');
+                    }
+                }
+                $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
+                               'href="'.theme_path('css/ie.css', null).'?version='.LACONICA_VERSION.'" /><![endif]');
+                Event::handle('EndShowUAStyles', array($this));
+            }
+            Event::handle('EndShowStyles', array($this));
         }
     }
 
@@ -178,18 +207,43 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showScripts()
     {
-        $this->element('script', array('type' => 'text/javascript',
-                                       'src' => common_path('js/jquery.min.js')),
-                       ' ');
-        $this->element('script', array('type' => 'text/javascript',
-                                       'src' => common_path('js/jquery.form.js')),
-                       ' ');
-        $this->element('script', array('type' => 'text/javascript',
-                                       'src' => common_path('js/xbImportNode.js')),
-                       ' ');
-        $this->element('script', array('type' => 'text/javascript',
-                                       'src' => common_path('js/util.js?version='.LACONICA_VERSION)),
-                       ' ');
+        if (Event::handle('StartShowScripts', array($this))) {
+            if (Event::handle('StartShowJQueryScripts', array($this))) {
+                $this->element('script', array('type' => 'text/javascript',
+                                               'src' => common_path('js/jquery.min.js')),
+                               ' ');
+                $this->element('script', array('type' => 'text/javascript',
+                                               'src' => common_path('js/jquery.form.js')),
+                               ' ');
+
+                $this->element('script', array('type' => 'text/javascript',
+                                               'src' => common_path('js/jquery.simplemodal-1.2.2.pack.js')),
+                               ' ');
+
+                Event::handle('EndShowJQueryScripts', array($this));
+            }
+            if (Event::handle('StartShowLaconicaScripts', array($this))) {
+                $this->element('script', array('type' => 'text/javascript',
+                                               'src' => common_path('js/xbImportNode.js')),
+                               ' ');
+                $this->element('script', array('type' => 'text/javascript',
+                                               'src' => common_path('js/util.js?version='.LACONICA_VERSION)),
+                               ' ');
+                // Frame-busting code to avoid clickjacking attacks.
+                $this->element('script', array('type' => 'text/javascript'),
+                               'if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
+
+                $this->element('script', array('type' => 'text/javascript',
+                                               'src' => common_path('js/flowplayer-3.0.5.min.js')),
+                               ' ');
+
+                $this->element('script', array('type' => 'text/javascript',
+                                               'src' => common_path('js/video.js')),
+                               ' ');
+                Event::handle('EndShowLaconicaScripts', array($this));
+            }
+            Event::handle('EndShowScripts', array($this));
+        }
     }
 
     /**
@@ -215,9 +269,19 @@ class Action extends HTMLOutputter // lawsuit
      *
      * @return nothing
      */
+
     function showFeeds()
     {
-        // does nothing by default
+        $feeds = $this->getFeeds();
+
+        if ($feeds) {
+            foreach ($feeds as $feed) {
+                $this->element('link', array('rel' => $feed->rel(),
+                                             'href' => $feed->url,
+                                             'type' => $feed->mimeType(),
+                                             'title' => $feed->title));
+            }
+        }
     }
 
     /**
@@ -244,7 +308,6 @@ class Action extends HTMLOutputter // lawsuit
         // does nothing by default
     }
 
-    
     /**
      * Show body.
      *
@@ -255,10 +318,16 @@ class Action extends HTMLOutputter // lawsuit
     function showBody()
     {
         $this->elementStart('body', array('id' => $this->trimmed('action')));
-        $this->elementStart('div', 'wrap');
-        $this->showHeader();
+        $this->elementStart('div', array('id' => 'wrap'));
+        if (Event::handle('StartShowHeader', array($this))) {
+            $this->showHeader();
+            Event::handle('EndShowHeader', array($this));
+        }
         $this->showCore();
-        $this->showFooter();
+        if (Event::handle('StartShowFooter', array($this))) {
+            $this->showFooter();
+            Event::handle('EndShowFooter', array($this));
+        }
         $this->elementEnd('div');
         $this->elementEnd('body');
     }
@@ -312,41 +381,51 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showPrimaryNav()
     {
+        $user = common_current_user();
+
         $this->elementStart('dl', array('id' => 'site_nav_global_primary'));
         $this->element('dt', null, _('Primary site navigation'));
         $this->elementStart('dd');
-        $user = common_current_user();
         $this->elementStart('ul', array('class' => 'nav'));
-        if ($user) {
-            $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
-                            _('Home'), _('Personal profile and friends timeline'), false, 'nav_home');
-        }
-        $this->menuItem(common_local_url('peoplesearch'),
-                        _('Search'), _('Search for people or text'), false, 'nav_search');
-        if ($user) {
-            $this->menuItem(common_local_url('profilesettings'),
-                            _('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account');
-            $this->menuItem(common_local_url('imsettings'),
-                            _('Connect'), _('Connect to IM, SMS, Twitter'), false, 'nav_connect');
-            $this->menuItem(common_local_url('logout'),
-                            _('Logout'), _('Logout from the site'), false, 'nav_logout');
-        } else {
-            $this->menuItem(common_local_url('login'),
-                            _('Login'), _('Login to the site'), false, 'nav_login');
-            if (!common_config('site', 'closed')) {
-                $this->menuItem(common_local_url('register'),
-                                _('Register'), _('Create an account'), false, 'nav_register');
+        if (Event::handle('StartPrimaryNav', array($this))) {
+            if ($user) {
+                $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
+                                _('Home'), _('Personal profile and friends timeline'), false, 'nav_home');
+            }
+            $this->menuItem(common_local_url('peoplesearch'),
+                            _('Search'), _('Search for people or text'), false, 'nav_search');
+            if ($user) {
+                $this->menuItem(common_local_url('profilesettings'),
+                                _('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account');
+
+                if (common_config('xmpp', 'enabled')) {
+                    $this->menuItem(common_local_url('imsettings'),
+                                    _('Connect'), _('Connect to IM, SMS, Twitter'), false, 'nav_connect');
+                } else {
+                    $this->menuItem(common_local_url('smssettings'),
+                                    _('Connect'), _('Connect to SMS, Twitter'), false, 'nav_connect');
+                }
+                $this->menuItem(common_local_url('logout'),
+                                _('Logout'), _('Logout from the site'), false, 'nav_logout');
+            } else {
+                $this->menuItem(common_local_url('login'),
+                                _('Login'), _('Login to the site'), false, 'nav_login');
+                if (!common_config('site', 'closed')) {
+                    $this->menuItem(common_local_url('register'),
+                                    _('Register'), _('Create an account'), false, 'nav_register');
+                }
+                $this->menuItem(common_local_url('openidlogin'),
+                                _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
             }
-            $this->menuItem(common_local_url('openidlogin'),
-                            _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
+            $this->menuItem(common_local_url('doc', array('title' => 'help')),
+                            _('Help'), _('Help me!'), false, 'nav_help');
+            Event::handle('EndPrimaryNav', array($this));
         }
-        $this->menuItem(common_local_url('doc', array('title' => 'help')),
-                        _('Help'), _('Help me!'), false, 'nav_help');
         $this->elementEnd('ul');
         $this->elementEnd('dd');
         $this->elementEnd('dl');
     }
-    
+
     /**
      * Show site notice.
      *
@@ -360,7 +439,9 @@ class Action extends HTMLOutputter // lawsuit
             $this->elementStart('dl', array('id' => 'site_notice',
                                             'class' => 'system_notice'));
             $this->element('dt', null, _('Site notice'));
-            $this->element('dd', null, $text);
+            $this->elementStart('dd', null);
+            $this->raw($text);
+            $this->elementEnd('dd');
             $this->elementEnd('dl');
         }
     }
@@ -377,7 +458,7 @@ class Action extends HTMLOutputter // lawsuit
         $notice_form = new NoticeForm($this);
         $notice_form->show();
     }
-    
+
     /**
      * Show anonymous message.
      *
@@ -400,8 +481,14 @@ class Action extends HTMLOutputter // lawsuit
     function showCore()
     {
         $this->elementStart('div', array('id' => 'core'));
-        $this->showLocalNavBlock();
-        $this->showContentBlock();
+        if (Event::handle('StartShowLocalNavBlock', array($this))) {
+            $this->showLocalNavBlock();
+            Event::handle('EndShowLocalNavBlock', array($this));
+        }
+        if (Event::handle('StartShowContentBlock', array($this))) {
+            $this->showContentBlock();
+            Event::handle('EndShowContentBlock', array($this));
+        }
         $this->showAside();
         $this->elementEnd('div');
     }
@@ -503,27 +590,32 @@ class Action extends HTMLOutputter // lawsuit
      *
      * @return nothing
      */
+
     function showAside()
     {
         $this->elementStart('div', array('id' => 'aside_primary',
                                          'class' => 'aside'));
         $this->showExportData();
-        $this->showSections();
+        if (Event::handle('StartShowSections', array($this))) {
+            $this->showSections();
+            Event::handle('EndShowSections', array($this));
+        }
         $this->elementEnd('div');
     }
 
     /**
      * Show export data feeds.
      *
-     * MAY overload if there are feeds
-     *
-     * @return nothing
+     * @return void
      */
+
     function showExportData()
     {
-        // is there structure to this?
-        // list of (visible!) feed links
-        // can we reuse list of feeds from showFeeds() ?
+        $feeds = $this->getFeeds();
+        if ($feeds) {
+            $fl = new FeedList($this);
+            $fl->show($feeds);
+        }
     }
 
     /**
@@ -562,18 +654,23 @@ class Action extends HTMLOutputter // lawsuit
         $this->element('dt', null, _('Secondary site navigation'));
         $this->elementStart('dd', null);
         $this->elementStart('ul', array('class' => 'nav'));
-        $this->menuItem(common_local_url('doc', array('title' => 'help')),
-                        _('Help'));
-        $this->menuItem(common_local_url('doc', array('title' => 'about')),
-                        _('About'));
-        $this->menuItem(common_local_url('doc', array('title' => 'faq')),
-                        _('FAQ'));
-        $this->menuItem(common_local_url('doc', array('title' => 'privacy')),
-                        _('Privacy'));
-        $this->menuItem(common_local_url('doc', array('title' => 'source')),
-                        _('Source'));
-        $this->menuItem(common_local_url('doc', array('title' => 'contact')),
-                        _('Contact'));
+        if (Event::handle('StartSecondaryNav', array($this))) {
+            $this->menuItem(common_local_url('doc', array('title' => 'help')),
+                            _('Help'));
+            $this->menuItem(common_local_url('doc', array('title' => 'about')),
+                            _('About'));
+            $this->menuItem(common_local_url('doc', array('title' => 'faq')),
+                            _('FAQ'));
+            $this->menuItem(common_local_url('doc', array('title' => 'privacy')),
+                            _('Privacy'));
+            $this->menuItem(common_local_url('doc', array('title' => 'source')),
+                            _('Source'));
+            $this->menuItem(common_local_url('doc', array('title' => 'contact')),
+                            _('Contact'));
+            $this->menuItem(common_local_url('doc', array('title' => 'badge')),
+                            _('Badge'));
+            Event::handle('EndSecondaryNav', array($this));
+        }
         $this->elementEnd('ul');
         $this->elementEnd('dd');
         $this->elementEnd('dl');
@@ -726,8 +823,10 @@ class Action extends HTMLOutputter // lawsuit
             if ($if_modified_since) {
                 $ims = strtotime($if_modified_since);
                 if ($lm <= $ims) {
-                    if (!$etag ||
-                        $this->_hasEtag($etag, $_SERVER['HTTP_IF_NONE_MATCH'])) {
+                    $if_none_match = $_SERVER['HTTP_IF_NONE_MATCH'];
+                    if (!$if_none_match ||
+                        !$etag ||
+                        $this->_hasEtag($etag, $if_none_match)) {
                         header('HTTP/1.1 304 Not Modified');
                         // Better way to do this?
                         exit(0);
@@ -745,15 +844,17 @@ class Action extends HTMLOutputter // lawsuit
      *
      * @return boolean
      */
+
     function _hasEtag($etag, $if_none_match)
     {
-        return ($if_none_match) && in_array($etag, explode(',', $if_none_match));
+        $etags = explode(',', $if_none_match);
+        return in_array($etag, $etags) || in_array('*', $etags);
     }
 
     /**
      * Boolean understands english (yes, no, true, false)
      *
-     * @param string $key query key we're interested in 
+     * @param string $key query key we're interested in
      * @param string $def default value
      *
      * @return boolean interprets yes/no strings as boolean
@@ -781,11 +882,12 @@ class Action extends HTMLOutputter // lawsuit
      *
      * @return nothing
      */
+
     function serverError($msg, $code=500)
     {
         $action = $this->trimmed('action');
         common_debug("Server error '$code' on '$action': $msg", __FILE__);
-        common_server_error($msg, $code);
+        throw new ServerException($msg, $code);
     }
 
     /**
@@ -796,11 +898,12 @@ class Action extends HTMLOutputter // lawsuit
      *
      * @return nothing
      */
+
     function clientError($msg, $code=400)
     {
         $action = $this->trimmed('action');
         common_debug("User error '$code' on '$action': $msg", __FILE__);
-        common_user_error($msg, $code);
+        throw new ClientException($msg, $code);
     }
 
     /**
@@ -873,17 +976,17 @@ class Action extends HTMLOutputter // lawsuit
         }
         if ($have_before) {
             $pargs   = array('page' => $page-1);
-            $newargs = $args ? array_merge($args, $pargs) : $pargs;
             $this->elementStart('li', array('class' => 'nav_prev'));
-            $this->element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'prev'),
+            $this->element('a', array('href' => common_local_url($action, $args, $pargs),
+                                      'rel' => 'prev'),
                            _('After'));
             $this->elementEnd('li');
         }
         if ($have_after) {
             $pargs   = array('page' => $page+1);
-            $newargs = $args ? array_merge($args, $pargs) : $pargs;
             $this->elementStart('li', array('class' => 'nav_next'));
-            $this->element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'next'),
+            $this->element('a', array('href' => common_local_url($action, $args, $pargs),
+                                      'rel' => 'next'),
                            _('Before'));
             $this->elementEnd('li');
         }
@@ -894,4 +997,17 @@ class Action extends HTMLOutputter // lawsuit
             $this->elementEnd('div');
         }
     }
+
+    /**
+     * An array of feeds for this action.
+     *
+     * Returns an array of potential feeds for this action.
+     *
+     * @return array Feed object to show in head and links
+     */
+
+    function getFeeds()
+    {
+        return null;
+    }
 }
diff --git a/classes/Channel.php b/lib/channel.php
index 2e3e4e8d4..f1e205546 100644
--- a/classes/Channel.php
+++ b/lib/channel.php
@@ -21,7 +21,6 @@ if (!defined('LACONICA')) { exit(1); }
 
 class Channel
 {
-    
     function on($user)
     {
         return false;
@@ -36,12 +35,12 @@ class Channel
     {
         return false;
     }
-    
+
     function error($user, $text)
     {
         return false;
     }
-    
+
     function source()
     {
         return null;
@@ -52,22 +51,22 @@ class XMPPChannel extends Channel
 {
 
     var $conn = null;
-    
+
     function source()
     {
         return 'xmpp';
     }
-    
+
     function __construct($conn)
     {
         $this->conn = $conn;
     }
-    
+
     function on($user)
     {
         return $this->set_notify($user, 1);
     }
-    
+
     function off($user)
     {
         return $this->set_notify($user, 0);
@@ -78,13 +77,13 @@ class XMPPChannel extends Channel
         $text = '['.common_config('site', 'name') . '] ' . $text;
         jabber_send_message($user->jabber, $text);
     }
-    
+
     function error($user, $text)
     {
         $text = '['.common_config('site', 'name') . '] ' . $text;
         jabber_send_message($user->jabber, $text);
     }
-    
+
     function set_notify(&$user, $notify)
     {
         $orig = clone($user);
@@ -105,20 +104,25 @@ class XMPPChannel extends Channel
     }
 }
 
-
 class WebChannel extends Channel
 {
+    var $out = null;
+
+    function __construct($out=null)
+    {
+        $this->out = $out;
+    }
 
     function source()
     {
         return 'web';
     }
-    
+
     function on($user)
     {
         return false;
     }
-    
+
     function off($user)
     {
         return false;
@@ -129,47 +133,49 @@ class WebChannel extends Channel
         # XXX: buffer all output and send it at the end
         # XXX: even better, redirect to appropriate page
         #      depending on what command was run
-        common_show_header(_('Command results'));
-        common_element('p', null, $text);
-        common_show_footer();
+        $this->out->startHTML();
+        $this->out->elementStart('head');
+        $this->out->element('title', null, _('Command results'));
+        $this->out->elementEnd('head');
+        $this->out->elementStart('body');
+        $this->out->element('p', array('id' => 'command_result'), $text);
+        $this->out->elementEnd('body');
+        $this->out->endHTML();
     }
-    
+
     function error($user, $text)
     {
         common_user_error($text);
     }
 }
 
-
 class AjaxWebChannel extends WebChannel
 {
-
     function output($user, $text)
     {
-        common_start_html('text/xml;charset=utf-8', true);
-        common_element_start('head');
-        common_element('title', null, _('Command results'));
-        common_element_end('head');
-        common_element_start('body');
-        common_element('p', array('id' => 'command_result'), $text);
-        common_element_end('body');
-        common_element_end('html');
+        $this->out->startHTML('text/xml;charset=utf-8');
+        $this->out->elementStart('head');
+        $this->out->element('title', null, _('Command results'));
+        $this->out->elementEnd('head');
+        $this->out->elementStart('body');
+        $this->out->element('p', array('id' => 'command_result'), $text);
+        $this->out->elementEnd('body');
+        $this->out->endHTML();
     }
 
     function error($user, $text)
     {
-        common_start_html('text/xml;charset=utf-8', true);
-        common_element_start('head');
-        common_element('title', null, _('Ajax Error'));
-        common_element_end('head');
-        common_element_start('body');
-        common_element('p', array('id' => 'error'), $text);
-        common_element_end('body');
-        common_element_end('html');
+        $this->out->startHTML('text/xml;charset=utf-8');
+        $this->out->elementStart('head');
+        $this->out->element('title', null, _('Ajax Error'));
+        $this->out->elementEnd('head');
+        $this->out->elementStart('body');
+        $this->out->element('p', array('id' => 'error'), $text);
+        $this->out->elementEnd('body');
+        $this->out->endHTML();
     }
 }
 
-
 class MailChannel extends Channel
 {
 
@@ -179,17 +185,17 @@ class MailChannel extends Channel
     {
         return 'mail';
     }
-    
+
     function __construct($addr=null)
     {
         $this->addr = $addr;
     }
-    
+
     function on($user)
     {
         return $this->set_notify($user, 1);
     }
-    
+
     function off($user)
     {
         return $this->set_notify($user, 0);
@@ -200,23 +206,23 @@ class MailChannel extends Channel
 
         $headers['From'] = $user->incomingemail;
         $headers['To'] = $this->addr;
-        
+
         $headers['Subject'] = _('Command complete');
 
         return mail_send(array($this->addr), $headers, $text);
     }
-    
+
     function error($user, $text)
     {
-        
+
         $headers['From'] = $user->incomingemail;
         $headers['To'] = $this->addr;
-        
+
         $headers['Subject'] = _('Command failed');
 
         return mail_send(array($this->addr), $headers, $text);
     }
-    
+
     function set_notify($user, $value)
     {
         $orig = clone($user);
diff --git a/lib/clienterroraction.php b/lib/clienterroraction.php
index ef6fd51df..0c48414d5 100644
--- a/lib/clienterroraction.php
+++ b/lib/clienterroraction.php
@@ -49,7 +49,7 @@ class ClientErrorAction extends ErrorAction
     function __construct($message='Error', $code=400)
     {
         parent::__construct($message, $code);
-        
+
         $this->status  = array(400 => 'Bad Request',
                                401 => 'Unauthorized',
                                402 => 'Payment Required',
@@ -70,9 +70,9 @@ class ClientErrorAction extends ErrorAction
                                417 => 'Expectation Failed');
         $this->default = 400;
     }
-    
+
     // XXX: Should these error actions even be invokable via URI?
-    
+
     function handle($args)
     {
         parent::handle($args);
@@ -84,11 +84,16 @@ class ClientErrorAction extends ErrorAction
         }
 
         $this->message = $this->trimmed('message');
-        
+
         if (!$this->message) {
-            $this->message = "Client Error $this->code"; 
-        }        
+            $this->message = "Client Error $this->code";
+        }
 
         $this->showPage();
     }
+
+    function title()
+    {
+        return $this->status[$this->code];
+    }
 }
diff --git a/lib/clientexception.php b/lib/clientexception.php
new file mode 100644
index 000000000..3020d7f50
--- /dev/null
+++ b/lib/clientexception.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * class for a client exception (user error)
+ *
+ * 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  Exception
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Class for client exceptions
+ *
+ * Subclass of PHP Exception for user errors.
+ *
+ * @category Exception
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class ClientException extends Exception
+{
+    public function __construct($message = null, $code = 400) {
+        parent::__construct($message, $code);
+    }
+
+    // custom string representation of object
+    public function __toString() {
+        return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
+    }
+}
diff --git a/classes/Command.php b/lib/command.php
index eacbdacb3..507990a0b 100644
--- a/classes/Command.php
+++ b/lib/command.php
@@ -19,18 +19,18 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once(INSTALLDIR.'/classes/Channel.php');
+require_once(INSTALLDIR.'/lib/channel.php');
 
 class Command
 {
-    
+
     var $user = null;
-    
+
     function __construct($user=null)
     {
         $this->user = $user;
     }
-    
+
     function execute($channel)
     {
         return false;
@@ -109,7 +109,7 @@ class StatsCommand extends Command
         $notices = new Notice();
         $notices->profile_id = $this->user->id;
         $notice_count = (int) $notices->count();
-        
+
         $channel->output($this->user, sprintf(_("Subscriptions: %1\$s\n".
                                    "Subscribers: %2\$s\n".
                                    "Notices: %3\$s"),
@@ -121,21 +121,21 @@ class StatsCommand extends Command
 
 class FavCommand extends Command
 {
-    
+
     var $other = null;
-    
+
     function __construct($user, $other)
     {
         parent::__construct($user);
         $this->other = $other;
     }
-    
+
     function execute($channel)
     {
-        
-        $recipient = 
+
+        $recipient =
           common_relative_profile($this->user, common_canonical_nickname($this->other));
-        
+
         if (!$recipient) {
             $channel->error($this->user, _('No such user.'));
             return;
@@ -145,7 +145,7 @@ class FavCommand extends Command
             $channel->error($this->user, _('User has no last notice'));
             return;
         }
-        
+
         $fave = Fave::addNew($this->user, $notice);
 
         if (!$fave) {
@@ -154,15 +154,15 @@ class FavCommand extends Command
         }
 
         $other = User::staticGet('id', $recipient->id);
-        
+
         if ($other && $other->id != $user->id) {
             if ($other->email && $other->emailnotifyfav) {
                 mail_notify_fave($other, $this->user, $notice);
             }
         }
-        
+
         $this->user->blowFavesCache();
-        
+
         $channel->output($this->user, _('Notice marked as fave.'));
     }
 }
@@ -175,17 +175,17 @@ class WhoisCommand extends Command
         parent::__construct($user);
         $this->other = $other;
     }
-    
+
     function execute($channel)
     {
-        $recipient = 
+        $recipient =
           common_relative_profile($this->user, common_canonical_nickname($this->other));
-        
+
         if (!$recipient) {
             $channel->error($this->user, _('No such user.'));
             return;
         }
-        
+
         $whois = sprintf(_("%1\$s (%2\$s)"), $recipient->nickname,
                          $recipient->profileurl);
         if ($recipient->fullname) {
@@ -214,7 +214,7 @@ class MessageCommand extends Command
         $this->other = $other;
         $this->text = $text;
     }
-    
+
     function execute($channel)
     {
         $other = User::staticGet('nickname', common_canonical_nickname($this->other));
@@ -229,7 +229,7 @@ class MessageCommand extends Command
                 return;
             }
         }
-        
+
         if (!$other) {
             $channel->error($this->user, _('No such user.'));
             return;
@@ -251,19 +251,19 @@ class MessageCommand extends Command
 
 class GetCommand extends Command
 {
-    
+
     var $other = null;
-    
+
     function __construct($user, $other)
     {
         parent::__construct($user);
         $this->other = $other;
     }
-    
+
     function execute($channel)
     {
         $target_nickname = common_canonical_nickname($this->other);
-        
+
         $target =
           common_relative_profile($this->user, $target_nickname);
 
@@ -277,32 +277,32 @@ class GetCommand extends Command
             return;
         }
         $notice_content = $notice->content;
-        
+
         $channel->output($this->user, $target_nickname . ": " . $notice_content);
     }
 }
 
 class SubCommand extends Command
 {
-    
+
     var $other = null;
-    
+
     function __construct($user, $other)
     {
         parent::__construct($user);
         $this->other = $other;
     }
-    
+
     function execute($channel)
     {
-        
+
         if (!$this->other) {
             $channel->error($this->user, _('Specify the name of the user to subscribe to'));
             return;
         }
-        
+
         $result = subs_subscribe_user($this->user, $this->other);
-        
+
         if ($result == 'true') {
             $channel->output($this->user, sprintf(_('Subscribed to %s'), $this->other));
         } else {
@@ -315,7 +315,7 @@ class UnsubCommand extends Command
 {
 
     var $other = null;
-    
+
     function __construct($user, $other)
     {
         parent::__construct($user);
@@ -328,9 +328,9 @@ class UnsubCommand extends Command
             $channel->error($this->user, _('Specify the name of the user to unsubscribe from'));
             return;
         }
-        
+
         $result=subs_unsubscribe_user($this->user, $this->other);
-        
+
         if ($result) {
             $channel->output($this->user, sprintf(_('Unsubscribed from %s'), $this->other));
         } else {
@@ -369,7 +369,7 @@ class OnCommand extends Command
         parent::__construct($user);
         $this->other = $other;
     }
-    
+
     function execute($channel)
     {
         if ($other) {
@@ -406,7 +406,7 @@ class HelpCommand extends Command
                            "unsub <nickname> - same as 'leave'\n".
                            "last <nickname> - same as 'get'\n".
                            "on <nickname> - not yet implemented.\n".
-                           "off <nickname> - not yet implemented.\n".                           
+                           "off <nickname> - not yet implemented.\n".
                            "nudge <nickname> - not yet implemented.\n".
                            "invite <phone number> - not yet implemented.\n".
                            "track <word> - not yet implemented.\n".
diff --git a/classes/CommandInterpreter.php b/lib/commandinterpreter.php
index 0679f5462..49c733c03 100644
--- a/classes/CommandInterpreter.php
+++ b/lib/commandinterpreter.php
@@ -19,11 +19,10 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once(INSTALLDIR.'/classes/Command.php');
+require_once INSTALLDIR.'/lib/command.php';
 
 class CommandInterpreter
 {
-
     function handle_command($user, $text)
     {
         # XXX: localise
diff --git a/lib/common.php b/lib/common.php
index cc82f8bd7..0355d01e3 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -19,12 +19,11 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('LACONICA_VERSION', '0.7.0');
+define('LACONICA_VERSION', '0.7.1');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
 define('AVATAR_MINI_SIZE', 24);
-define('MAX_AVATAR_SIZE', 256 * 1024);
 
 define('NOTICES_PER_PAGE', 20);
 define('PROFILES_PER_PAGE', 20);
@@ -50,15 +49,31 @@ require_once('DB/DataObject/Cast.php'); # for dates
 
 require_once(INSTALLDIR.'/lib/language.php');
 
+// This gets included before the config file, so that admin code and plugins
+// can use it
+
+require_once(INSTALLDIR.'/lib/event.php');
+require_once(INSTALLDIR.'/lib/plugin.php');
+
+// try to figure out where we are
+
+$_server = array_key_exists('SERVER_NAME', $_SERVER) ?
+  strtolower($_SERVER['SERVER_NAME']) :
+  null;
+$_path = array_key_exists('SCRIPT_NAME', $_SERVER) ?
+  substr($_SERVER['SCRIPT_NAME'], 1, strrpos($_SERVER['SCRIPT_NAME'], '/') - 1) :
+  null;
+
 // default configuration, overwritten in config.php
 
 $config =
   array('site' =>
         array('name' => 'Just another Laconica microblog',
-              'server' => 'localhost',
+              'server' => $_server,
               'theme' => 'default',
-              'path' => '/',
+              'path' => $_path,
               'logfile' => null,
+              'logdebug' => false,
               'fancy' => false,
               'locale_path' => INSTALLDIR.'/locale',
               'language' => 'en_US',
@@ -92,7 +107,8 @@ $config =
         array('server' => null),
         'public' =>
         array('localonly' => true,
-              'blacklist' => array()),
+              'blacklist' => array(),
+              'autosource' => array()),
         'theme' =>
         array('server' => null),
         'throttle' =>
@@ -152,7 +168,45 @@ if (function_exists('date_default_timezone_set')) {
     date_default_timezone_set('UTC');
 }
 
-require_once(INSTALLDIR.'/config.php');
+// From most general to most specific:
+// server-wide, then vhost-wide, then for a path,
+// finally for a dir (usually only need one of the last two).
+
+$_config_files = array('/etc/laconica/laconica.php',
+                  '/etc/laconica/'.$_server.'.php');
+
+if (strlen($_path) > 0) {
+    $_config_files[] = '/etc/laconica/'.$_server.'_'.$_path.'.php';
+}
+
+$_config_files[] = INSTALLDIR.'/config.php';
+
+$_have_a_config = false;
+
+foreach ($_config_files as $_config_file) {
+    if (file_exists($_config_file)) {
+        include_once($_config_file);
+        $_have_a_config = true;
+    }
+}
+
+function _have_config()
+{
+    global $_have_a_config;
+    return $_have_a_config;
+}
+
+// XXX: Throw a conniption if database not installed
+
+// Fixup for laconica.ini
+
+$_db_name = substr($config['db']['database'], strrpos($config['db']['database'], '/') + 1);
+
+if ($_db_name != 'laconica' && !array_key_exists('ini_'.$_db_name, $config['db'])) {
+    $config['db']['ini_'.$_db_name] = INSTALLDIR.'/classes/laconica.ini';
+}
+
+// XXX: how many of these could be auto-loaded on use?
 
 require_once('Validate.php');
 require_once('markdown.php');
@@ -165,6 +219,9 @@ require_once(INSTALLDIR.'/lib/subs.php');
 require_once(INSTALLDIR.'/lib/Shorturl_api.php');
 require_once(INSTALLDIR.'/lib/twitter.php');
 
+require_once(INSTALLDIR.'/lib/clientexception.php');
+require_once(INSTALLDIR.'/lib/serverexception.php');
+
 // XXX: other formats here
 
 define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
@@ -177,5 +234,12 @@ function __autoload($class)
         require_once(INSTALLDIR.'/classes/' . $class . '.php');
     } else if (file_exists(INSTALLDIR.'/lib/' . strtolower($class) . '.php')) {
         require_once(INSTALLDIR.'/lib/' . strtolower($class) . '.php');
+    } else if (mb_substr($class, -6) == 'Action' &&
+               file_exists(INSTALLDIR.'/actions/' . strtolower(mb_substr($class, 0, -6)) . '.php')) {
+        require_once(INSTALLDIR.'/actions/' . strtolower(mb_substr($class, 0, -6)) . '.php');
     }
 }
+
+// Give plugins a chance to initialize in a fully-prepared environment
+
+Event::handle('InitializePlugin');
diff --git a/lib/dberroraction.php b/lib/dberroraction.php
new file mode 100644
index 000000000..0dc92490c
--- /dev/null
+++ b/lib/dberroraction.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * DB error action.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ *
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/servererroraction.php';
+
+/**
+ * Class for displaying DB Errors
+ *
+ * This only occurs if there's been a DB_DataObject_Error that's
+ * reported through PEAR, so we try to avoid doing anything that connects
+ * to the DB, so we don't trigger it again.
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ */
+
+class DBErrorAction extends ServerErrorAction
+{
+    function __construct($message='Error', $code=500)
+    {
+        parent::__construct($message, $code);
+    }
+
+    function title()
+    {
+        return _('Database error');
+    }
+
+    function getLanguage()
+    {
+        // Don't try to figure out user's language; just show the page
+        return common_config('site', 'language');
+    }
+
+    function showPrimaryNav()
+    {
+        // don't show primary nav
+    }
+}
diff --git a/lib/error.php b/lib/error.php
index 9842053d8..526d9f81b 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -111,7 +111,7 @@ class ErrorAction extends Action
     function showBody()
     {
         $this->elementStart('body', array('id' => 'error'));
-        $this->elementStart('div', 'wrap');
+        $this->elementStart('div', array('id' => 'wrap'));
         $this->showHeader();
         $this->showCore();
         $this->showFooter();
@@ -130,6 +130,7 @@ class ErrorAction extends Action
     {
         $this->elementStart('div', array('id' => 'header'));
         $this->showLogo();
+        $this->showPrimaryNav();
         $this->elementEnd('div');
     }
 
diff --git a/lib/event.php b/lib/event.php
new file mode 100644
index 000000000..d815ae54b
--- /dev/null
+++ b/lib/event.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * utilities for defining and running event handlers
+ *
+ * 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  Event
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Class for events
+ *
+ * This "class" two static functions for managing events in the Laconica code.
+ *
+ * @category Event
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @todo     Define a system for using Event instances
+ */
+
+class Event {
+
+    /* Global array of hooks, mapping eventname => array of callables */
+
+    protected static $_handlers = array();
+
+    /**
+     * Add an event handler
+     *
+     * To run some code at a particular point in Laconica processing.
+     * Named events include receiving an XMPP message, adding a new notice,
+     * or showing part of an HTML page.
+     *
+     * The arguments to the handler vary by the event. Handlers can return
+     * two possible values: false means that the event has been replaced by
+     * the handler completely, and no default processing should be done.
+     * Non-false means successful handling, and that the default processing
+     * should succeed. (Note that this only makes sense for some events.)
+     *
+     * Handlers can also abort processing by throwing an exception; these will
+     * be caught by the closest code and displayed as errors.
+     *
+     * @param string   $name    Name of the event
+     * @param callable $handler Code to run
+     *
+     * @return void
+     */
+
+    public static function addHandler($name, $handler) {
+        if (array_key_exists($name, Event::$_handlers)) {
+            Event::$_handlers[$name][] = $handler;
+        } else {
+            Event::$_handlers[$name] = array($handler);
+        }
+    }
+
+    /**
+     * Handle an event
+     *
+     * Events are any point in the code that we want to expose for admins
+     * or third-party developers to use.
+     *
+     * We pass in an array of arguments (including references, for stuff
+     * that can be changed), and each assigned handler gets run with those
+     * arguments. Exceptions can be thrown to indicate an error.
+     *
+     * @param string $name Name of the event that's happening
+     * @param array  $args Arguments for handlers
+     *
+     * @return boolean flag saying whether to continue processing, based
+     *                 on results of handlers.
+     */
+
+    public static function handle($name, $args=array()) {
+        $result = null;
+        if (array_key_exists($name, Event::$_handlers)) {
+            foreach (Event::$_handlers[$name] as $handler) {
+                $result = call_user_func_array($handler, $args);
+                if ($result === false) {
+                    break;
+                }
+            }
+        }
+        return ($result !== false);
+    }
+}
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index c781b86f4..043a078cd 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -122,15 +122,14 @@ class FacebookAction extends Action
         // Add a timestamp to the file so Facebook cache wont ignore our changes
         $ts = filemtime(INSTALLDIR.'/js/facebookapp.js');
         
-        $this->element('script', array('type' => 'text/javascript',
-                                       'src' => common_path('js/facebookapp.js') . '?ts=' . $ts));
+        $this->element('script', array('src' => common_path('js/facebookapp.js') . '?ts=' . $ts));
     }
     
     /**
      * Start an Facebook ready HTML document
      *
      *  For Facebook we don't want to actually output any headers,
-     *  DTD info, etc.
+     *  DTD info, etc.  Just Stylesheet and JavaScript links.
      *
      * If $type isn't specified, will attempt to do content negotiation.
      *
@@ -141,6 +140,9 @@ class FacebookAction extends Action
 
     function startHTML($type=null) 
     {          
+        $this->showStylesheets();
+        $this->showScripts();
+        
         $this->elementStart('div', array('class' => 'facebook-page'));
     }
 
@@ -169,7 +171,7 @@ class FacebookAction extends Action
 
     function showBody()
     {
-        $this->elementStart('div', 'wrap');
+        $this->elementStart('div', array('id' => 'wrap'));
         $this->showHeader();
         $this->showCore();
         $this->showFooter();
@@ -182,8 +184,6 @@ class FacebookAction extends Action
 
     function showHead($error, $success)
     {
-        $this->showStylesheets();
-        $this->showScripts();
         
         if ($error) {
             $this->element("h1", null, $error);
@@ -205,7 +205,6 @@ class FacebookAction extends Action
     // Make this into a widget later
     function showLocalNav()
     {
-                
         $this->elementStart('ul', array('class' => 'nav'));
 
         $this->elementStart('li', array('class' =>
@@ -230,18 +229,7 @@ class FacebookAction extends Action
         $this->elementEnd('li');
 
         $this->elementEnd('ul');
-
     }     
-
-    /**
-     * Show primary navigation.
-     *
-     * @return nothing
-     */
-    function showPrimaryNav()
-    {
-        // we don't want to show anything for this
-    }
     
     /**
      * Show header of the page.
@@ -255,7 +243,6 @@ class FacebookAction extends Action
         $this->elementStart('div', array('id' => 'header'));
         $this->showLogo();
         $this->showNoticeForm();
-        $this->showPrimaryNav();
         $this->elementEnd('div');
     }
     
@@ -276,12 +263,13 @@ class FacebookAction extends Action
     function showInstructions()
     {
 
+        $this->elementStart('div', array('class' => 'facebook_guide'));
+
         $this->elementStart('dl', array('class' => 'system_notice'));
         $this->element('dt', null, 'Page Notice');
 
         $loginmsg_part1 = _('To use the %s Facebook Application you need to login ' .
             'with your username and password. Don\'t have a username yet? ');
-
         $loginmsg_part2 = _(' a new account.');
 
         $this->elementStart('dd');
@@ -290,15 +278,18 @@ class FacebookAction extends Action
         $this->element('a',
             array('href' => common_local_url('register')), _('Register'));
         $this->text($loginmsg_part2);
+	$this->elementEnd('p');
         $this->elementEnd('dd');
+
         $this->elementEnd('dl');
+        $this->elementEnd('div');
     }
 
 
     function showLoginForm($msg = null)
     {
 
-        $this->elementStart('div', array('class' => 'content'));
+        $this->elementStart('div', array('id' => 'content'));
         $this->element('h1', null, _('Login'));
 
         if ($msg) {
@@ -315,7 +306,6 @@ class FacebookAction extends Action
                                                'action' => 'index.php'));
 
         $this->elementStart('fieldset');
-        $this->element('legend', null, _('Login to site'));
 
         $this->elementStart('ul', array('class' => 'form_datas'));
         $this->elementStart('li');
@@ -327,6 +317,7 @@ class FacebookAction extends Action
         $this->elementEnd('ul');
 
         $this->submit('submit', _('Login'));
+	$this->elementEnd('fieldset');
         $this->elementEnd('form');
 
         $this->elementStart('p');
@@ -335,6 +326,7 @@ class FacebookAction extends Action
         $this->elementEnd('p');
 
         $this->elementEnd('div');
+        $this->elementEnd('div');
 
     }
     
@@ -344,42 +336,70 @@ class FacebookAction extends Action
 
         // Need to include inline CSS for styling the Profile box
 
+	$app_props = $this->facebook->api_client->Admin_getAppProperties(array('icon_url'));
+	$icon_url = $app_props['icon_url'];
+
         $style = '<style>
+	 .entry-title *,
+	 .entry-content * {
+	 font-size:14px;
+	 font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif;
+	 }
+	 .entry-title a,
+	 .entry-content a {
+	 color:#002E6E;
+	 }
+
          .entry-title .vcard .photo {
          float:left;
          display:inline;
+	 margin-right:11px;
+	 margin-bottom:11px
          }
-         .entry-title .vcard .nickname {
-         margin-left:5px;
-         }
-
+	 .entry-title {
+	 margin-bottom:11px;
+	 }
          .entry-title p.entry-content {
          display:inline;
-         margin-left:5px;
+	 margin-left:5px;
          }
 
+	 div.entry-content {
+	 clear:both;
+	 }
          div.entry-content dl,
          div.entry-content dt,
          div.entry-content dd {
          display:inline;
+	 text-transform:lowercase;
          }
 
-         div.entry-content dt,
-         div.entry-content dd {
-         display:inline;
-         margin-left:5px;
+         div.entry-content dd,
+	 div.entry-content .device dt {
+	 margin-left:0;
+	 margin-right:5px;
          }
-         div.entry-content dl.timestamp dt {
+         div.entry-content dl.timestamp dt,
+	 div.entry-content dl.response dt {
          display:none;
          }
          div.entry-content dd a {
          display:inline-block;
          }
+
+	 #facebook_laconica_app {
+	 text-indent:-9999px;
+	 height:16px;
+	 width:16px;
+	 display:block;
+	 background:url('.$icon_url.') no-repeat 0 0;
+	 float:right;
+	 }
          </style>';        
 
         $this->xw->openMemory();
 
-        $item = new FacebookNoticeListItem($notice, $this);
+        $item = new FacebookProfileBoxNotice($notice, $this);
         $item->show();
 
         $fbml = "<fb:wide>$style " . $this->xw->outputMemory(false) . "</fb:wide>";
@@ -438,6 +458,64 @@ class FacebookAction extends Action
         }
     }
     
+    function updateFacebookStatus($notice) 
+    {
+        $prefix = $this->facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX, $this->fbuid);
+        $content = "$prefix $notice->content";
+        
+        if ($this->facebook->api_client->users_hasAppPermission('status_update', $this->fbuid)) {
+            $this->facebook->api_client->users_setStatus($content, $this->fbuid, false, true);
+        }
+    }
+    
+    function saveNewNotice()
+    {
+
+        $user = $this->flink->getUser();
+
+        $content = $this->trimmed('status_textarea');
+        
+        if (!$content) {
+            $this->showPage(_('No notice content!'));
+            return;
+        } else {
+            $content_shortened = common_shorten_links($content);
+
+            if (mb_strlen($content_shortened) > 140) {
+                $this->showPage(_('That\'s too long. Max notice size is 140 chars.'));
+                return;
+            }
+        }
+
+        $inter = new CommandInterpreter();
+
+        $cmd = $inter->handle_command($user, $content_shortened);
+
+        if ($cmd) {
+            
+            // XXX fix this
+            
+            $cmd->execute(new WebChannel());
+            return;
+        }
+
+        $replyto = $this->trimmed('inreplyto');
+
+        $notice = Notice::saveNew($user->id, $content,
+            'Facebook', 1, ($replyto == 'false') ? null : $replyto);
+
+        if (is_string($notice)) {
+            $this->showPage($notice);
+            return;
+        }
+
+        common_broadcast_notice($notice);
+        
+        // Also update the user's Facebook status
+        $this->updateFacebookStatus($notice);
+        $this->updateProfileBox($notice);
+        
+    }
 
 }
 
@@ -476,6 +554,18 @@ class FacebookNoticeForm extends NoticeForm
 
 class FacebookNoticeList extends NoticeList
 {
+    
+    /**
+     * constructor
+     *
+     * @param Notice $notice stream of notices from DB_DataObject
+     */
+
+    function __construct($notice, $out=null)
+    {
+        parent::__construct($notice, $out);
+    }
+    
     /**
      * show the list of notices
      *
@@ -530,6 +620,20 @@ class FacebookNoticeList extends NoticeList
 
 class FacebookNoticeListItem extends NoticeListItem
 {    
+
+    /**
+     * constructor
+     *
+     * Also initializes the profile attribute.
+     *
+     * @param Notice $notice The notice we'll display
+     */
+
+    function __construct($notice, $out=null)
+    {
+        parent::__construct($notice, $out);
+    }
+
     /**
      * recipe function for displaying a single notice in the Facebook App.
      *
@@ -582,3 +686,65 @@ class FacebookNoticeListItem extends NoticeListItem
     }
 
 }
+
+
+class FacebookProfileBoxNotice extends FacebookNoticeListItem
+{    
+    
+    /**
+     * constructor
+     *
+     * Also initializes the profile attribute.
+     *
+     * @param Notice $notice The notice we'll display
+     */
+
+    function __construct($notice, $out=null)
+    {
+        parent::__construct($notice, $out);
+    }
+    
+    /**
+     * Recipe function for displaying a single notice in the 
+     * Facebook App's Profile
+     *
+     * @return void
+     */
+
+    function show()
+    {
+
+        $this->out->elementStart('div', 'entry-title');
+        $this->showAuthor();
+        $this->showContent();
+        $this->out->elementEnd('div');
+
+        $this->out->elementStart('div', 'entry-content');
+
+        $this->showNoticeLink();
+        $this->showNoticeSource();
+        $this->showReplyTo();
+        $this->out->elementEnd('div');
+        
+        $this->showAppLink();
+
+    }
+
+    function showAppLink() 
+    {
+        
+        $this->facebook = getFacebook();
+
+        $app_props = $this->facebook->api_client->Admin_getAppProperties(
+                array('canvas_name', 'application_name'));
+
+        $this->app_uri = 'http://apps.facebook.com/' . $app_props['canvas_name'];
+        $this->app_name = $app_props['application_name'];
+        
+        $this->out->elementStart('a', array('id' => 'facebook_laconica_app',
+                                            'href' => $this->app_uri));
+        $this->out->text($this->app_name);
+        $this->out->elementEnd('a');
+    }
+
+}
diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index 8454590d6..ec3987273 100644
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -25,20 +25,6 @@ define("FACEBOOK_SERVICE", 2); // Facebook is foreign_service ID 2
 define("FACEBOOK_NOTICE_PREFIX", 1);
 define("FACEBOOK_PROMPTED_UPDATE_PREF", 2);
 
-// Gets all the notices from users with a Facebook link since a given ID
-function getFacebookNotices($since)
-{
-    $qry = 'SELECT notice.* ' .
-        'FROM notice ' .
-        'JOIN foreign_link ' .
-        'WHERE notice.profile_id = foreign_link.user_id ' .
-        'AND foreign_link.service = 2 ' . 
-        'ORDER BY notice.created DESC';
-
-    // XXX: What should the limit be?
-    return Notice::getStreamDirect($qry, 0, 100, 0, 0, null, $since);
-}
-
 function getFacebook()
 {
     $apikey = common_config('facebook', 'apikey');
@@ -51,3 +37,97 @@ function updateProfileBox($facebook, $flink, $notice) {
     $fbaction->updateProfileBox($notice);
 }
 
+function isFacebookBound($notice, $flink) {
+
+    // If the user does not want to broadcast to Facebook, move along
+    if (!($flink->noticesync & FOREIGN_NOTICE_SEND == FOREIGN_NOTICE_SEND)) {
+        common_log(LOG_INFO, "Skipping notice $notice->id " .
+            'because user has FOREIGN_NOTICE_SEND bit off.');
+        return false;
+    }
+
+    $success = false;
+
+    // If it's not a reply, or if the user WANTS to send @-replies...
+    if (!preg_match('/@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) ||
+        ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY)) {
+
+        $success = true;
+
+        // The two condition below are deal breakers:
+
+        // Avoid a loop
+        if ($notice->source == 'Facebook') {
+            common_log(LOG_INFO, "Skipping notice $notice->id because its " .
+                'source is Facebook.');
+            $success = false;
+        }
+
+        $facebook = getFacebook();
+        $fbuid = $flink->foreign_id;
+
+        try {
+
+            // Check to see if the user has given the FB app status update perms
+            $result = $facebook->api_client->
+                users_hasAppPermission('status_update', $fbuid);
+
+            if ($result != 1) {
+                $user = $flink->getUser();
+                $msg = "Can't send notice $notice->id to Facebook " .
+                    "because user $user->nickname hasn't given the " .
+                    'Facebook app \'status_update\' permission.';
+                common_log(LOG_INFO, $msg);
+                $success = false;
+            }
+
+        } catch(FacebookRestClientException $e){
+            common_log(LOG_ERR, $e->getMessage());
+            $success = false;
+        }
+
+    }
+
+    return $success;
+
+}
+
+
+function facebookBroadcastNotice($notice)
+{
+    $facebook = getFacebook();
+    $flink = Foreign_link::getByUserID($notice->profile_id, FACEBOOK_SERVICE);
+    $fbuid = $flink->foreign_id;
+
+    if (isFacebookBound($notice, $flink)) {
+
+        $status = null;
+
+        // Get the status 'verb' (prefix) the user has set
+        try {
+            $prefix = $facebook->api_client->
+                data_getUserPreference(FACEBOOK_NOTICE_PREFIX, $fbuid);
+
+            $status = "$prefix $notice->content";
+
+        } catch(FacebookRestClientException $e) {
+            common_log(LOG_ERR, $e->getMessage());
+            return false;
+        }
+
+        // Okay, we're good to go!
+
+        try {
+            $facebook->api_client->users_setStatus($status, $fbuid, false, true);
+            updateProfileBox($facebook, $flink, $notice);
+        } catch(FacebookRestClientException $e) {
+            common_log(LOG_ERR, $e->getMessage());
+            return false;
+
+             // Should we remove flink if this fails?
+        }
+
+    }
+
+    return true;
+}
diff --git a/lib/featureduserssection.php b/lib/featureduserssection.php
index 2935d8363..aed94b1a5 100644
--- a/lib/featureduserssection.php
+++ b/lib/featureduserssection.php
@@ -86,4 +86,9 @@ class FeaturedUsersSection extends ProfileSection
     {
         return 'featured_users';
     }
+
+    function moreUrl()
+    {
+        return common_local_url('featured');
+    }
 }
diff --git a/lib/feed.php b/lib/feed.php
new file mode 100644
index 000000000..466926844
--- /dev/null
+++ b/lib/feed.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Data structure for info about syndication feeds (RSS 1.0, RSS 2.0, Atom)
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Feed
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Data structure for feeds
+ *
+ * This structure is a helpful container for shipping around information about syndication feeds.
+ *
+ * @category Feed
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class Feed
+{
+    const RSS1 = 1;
+    const RSS2 = 2;
+    const ATOM = 3;
+    const FOAF = 4;
+
+    var $type = null;
+    var $url = null;
+    var $title = null;
+
+    function __construct($type, $url, $title)
+    {
+        $this->type  = $type;
+        $this->url   = $url;
+        $this->title = $title;
+    }
+
+    function mimeType()
+    {
+        switch ($this->type) {
+         case Feed::RSS1:
+            return 'application/rdf+xml';
+         case Feed::RSS2:
+            return 'application/rss+xml';
+         case Feed::ATOM:
+            return 'application/atom+xml';
+         case Feed::FOAF:
+            return 'application/rdf+xml';
+         default:
+            return null;
+        }
+    }
+
+    function typeName()
+    {
+        switch ($this->type) {
+         case Feed::RSS1:
+            return _('RSS 1.0');
+         case Feed::RSS2:
+            return _('RSS 2.0');
+         case Feed::ATOM:
+            return _('Atom');
+         case Feed::FOAF:
+            return _('FOAF');
+         default:
+            return null;
+        }
+    }
+
+    function rel()
+    {
+        switch ($this->type) {
+         case Feed::RSS1:
+         case Feed::RSS2:
+         case Feed::ATOM:
+            return 'alternate';
+         case Feed::FOAF:
+            return 'meta';
+         default:
+            return null;
+        }
+    }
+}
diff --git a/lib/feedlist.php b/lib/feedlist.php
index 47d909e96..927e43c33 100644
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -50,7 +50,7 @@ if (!defined('LACONICA')) {
 class FeedList extends Widget
 {
     var $action = null;
-    
+
     function __construct($action=null)
     {
 	parent::__construct($action);
@@ -64,8 +64,8 @@ class FeedList extends Widget
         $this->out->element('h2', null, _('Export data'));
         $this->out->elementStart('ul', array('class' => 'xoxo'));
 
-        foreach ($feeds as $key => $value) {
-            $this->feedItem($feeds[$key]);
+        foreach ($feeds as $feed) {
+            $this->feedItem($feed);
         }
 
         $this->out->elementEnd('ul');
@@ -74,85 +74,27 @@ class FeedList extends Widget
 
     function feedItem($feed)
     {
-        $nickname = $this->action->trimmed('nickname');
-
-        switch($feed['item']) {
-         case 'notices': default:
-            $feed_classname = $feed['type'];
-            $feed_mimetype = "application/".$feed['type']."+xml";
-            $feed_title = "$nickname's ".$feed['version']." notice feed";
-            $feed['textContent'] = "RSS";
-            break;
-
-         case 'allrss':
-            $feed_classname = $feed['type'];
-            $feed_mimetype = "application/".$feed['type']."+xml";
-            $feed_title = $feed['version']." feed for $nickname and friends";
-            $feed['textContent'] = "RSS";
-            break;
-
-         case 'repliesrss':
-            $feed_classname = $feed['type'];
-            $feed_mimetype = "application/".$feed['type']."+xml";
-            $feed_title = $feed['version']." feed for replies to $nickname";
-            $feed['textContent'] = "RSS";
-            break;
-
-         case 'publicrss':
-            $feed_classname = $feed['type'];
-            $feed_mimetype = "application/".$feed['type']."+xml";
-            $feed_title = "Public timeline ".$feed['version']." feed";
-            $feed['textContent'] = "RSS";
-            break;
+        $classname = null;
 
-         case 'publicatom':
-            $feed_classname = "atom";
-            $feed_mimetype = "application/".$feed['type']."+xml";
-            $feed_title = "Public timeline ".$feed['version']." feed";
-            $feed['textContent'] = "Atom";
+        switch ($feed->type) {
+         case Feed::RSS1:
+         case Feed::RSS2:
+            $classname = 'rss';
             break;
-
-         case 'tagrss':
-            $feed_classname = $feed['type'];
-            $feed_mimetype = "application/".$feed['type']."+xml";
-            $feed_title = $feed['version']." feed for this tag";
-            $feed['textContent'] = "RSS";
+         case Feed::ATOM:
+            $classname = 'atom';
             break;
-
-         case 'favoritedrss':
-            $feed_classname = $feed['type'];
-            $feed_mimetype = "application/".$feed['type']."+xml";
-            $feed_title = "Favorited ".$feed['version']." feed";
-            $feed['textContent'] = "RSS";
-            break;
-
-         case 'foaf':
-            $feed_classname = "foaf";
-            $feed_mimetype = "application/".$feed['type']."+xml";
-            $feed_title = "$nickname's FOAF file";
-            $feed['textContent'] = "FOAF";
-            break;
-
-         case 'favoritesrss':
-            $feed_classname = "favorites";
-            $feed_mimetype = "application/".$feed['type']."+xml";
-            $feed_title = "Feed for favorites of $nickname";
-            $feed['textContent'] = "RSS";
-            break;
-
-         case 'usertimeline':
-            $feed_classname = "atom";
-            $feed_mimetype = "application/".$feed['type']."+xml";
-            $feed_title = "$nickname's ".$feed['version']." notice feed";
-            $feed['textContent'] = "Atom";
+         case Feed::FOAF:
+            $classname = 'foaf';
             break;
         }
+
         $this->out->elementStart('li');
-        $this->out->element('a', array('href' => $feed['href'],
-                                  'class' => $feed_classname,
-                                  'type' => $feed_mimetype,
-                                  'title' => $feed_title),
-                       $feed['textContent']);
+        $this->out->element('a', array('href' => $feed->url,
+                                       'class' => $classname,
+                                       'type' => $feed->mimeType(),
+                                       'title' => $feed->title),
+                            $feed->typeName());
         $this->out->elementEnd('li');
     }
 }
diff --git a/lib/grouplist.php b/lib/grouplist.php
index 629bdd05d..1b8547499 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -124,7 +124,7 @@ class GroupList extends Widget
         if ($this->group->location) {
             $this->out->elementStart('dl', 'entity_location');
             $this->out->element('dt', null, _('Location'));
-            $this->out->elementStart('dd', 'location');
+            $this->out->elementStart('dd', 'label');
             $this->out->raw($this->highlight($this->group->location));
             $this->out->elementEnd('dd');
             $this->out->elementEnd('dl');
@@ -151,13 +151,16 @@ class GroupList extends Widget
 
         # If we're on a list with an owner (subscriptions or subscribers)...
 
-        if ($user && $user->id == $this->owner->id) {
+        if (!empty($user) && !empty($this->owner) && $user->id == $this->owner->id) {
             $this->showOwnerControls();
         }
 
         $this->out->elementEnd('div');
 
         if ($user) {
+            $this->out->elementStart('div', 'entity_actions');
+            $this->out->elementStart('ul');
+            $this->out->elementStart('li', 'entity_subscribe');
             # XXX: special-case for user looking at own
             # subscriptions page
             if ($user->isMember($this->group)) {
@@ -167,6 +170,9 @@ class GroupList extends Widget
                 $jf = new JoinForm($this->out, $this->group);
                 $jf->show();
             }
+            $this->out->elementEnd('li');
+            $this->out->elementEnd('ul');
+            $this->out->elementEnd('div');
         }
 
         $this->out->elementEnd('li');
diff --git a/lib/groupsbymemberssection.php b/lib/groupsbymemberssection.php
index 4fa07a244..5f26c6626 100644
--- a/lib/groupsbymemberssection.php
+++ b/lib/groupsbymemberssection.php
@@ -45,7 +45,7 @@ class GroupsByMembersSection extends GroupSection
 {
     function getGroups()
     {
-        $qry = 'SELECT user_group.*, count(*) as value ' .
+        $qry = 'SELECT user_group.id, count(*) as value ' .
           'FROM user_group JOIN group_member '.
           'ON user_group.id = group_member.group_id ' .
           'GROUP BY user_group.id ' .
diff --git a/lib/groupsbypostssection.php b/lib/groupsbypostssection.php
index a5e33a93d..1a60ddb4f 100644
--- a/lib/groupsbypostssection.php
+++ b/lib/groupsbypostssection.php
@@ -45,7 +45,7 @@ class GroupsByPostsSection extends GroupSection
 {
     function getGroups()
     {
-        $qry = 'SELECT user_group.*, count(*) as value ' .
+        $qry = 'SELECT user_group.id, count(*) as value ' .
           'FROM user_group JOIN group_inbox '.
           'ON user_group.id = group_inbox.group_id ' .
           'GROUP BY user_group.id ' .
diff --git a/lib/grouptagcloudsection.php b/lib/grouptagcloudsection.php
index f05be85cb..5d68af28b 100644
--- a/lib/grouptagcloudsection.php
+++ b/lib/grouptagcloudsection.php
@@ -58,8 +58,14 @@ class GroupTagCloudSection extends TagCloudSection
 
     function getTags()
     {
+        if (common_config('db', 'type') == 'pgsql') {
+            $weightexpr='sum(exp(-extract(epoch from (now() - notice_tag.created)) / %s))';
+        } else {
+            $weightexpr='sum(exp(-(now() - notice_tag.created) / %s))';
+        }
+
         $qry = 'SELECT notice_tag.tag, '.
-          'sum(exp(-(now() - notice_tag.created)/%s)) as weight ' .
+          $weightexpr . ' as weight ' .
           'FROM notice_tag JOIN notice ' .
           'ON notice_tag.notice_id = notice.id ' .
           'JOIN group_inbox on group_inbox.notice_id = notice.id ' .
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index f9245414f..06603ac05 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -101,29 +101,32 @@ class HTMLOutputter extends XMLOutputter
             $type = common_negotiate_type($cp, $sp);
 
             if (!$type) {
-                common_user_error(_('This page is not available in a '.
-                                    'media type you accept'), 406);
-                exit(0);
+                throw new ClientException(_('This page is not available in a '.
+                                            'media type you accept'), 406);
             }
         }
 
         header('Content-Type: '.$type);
-        
+
         $this->extraHeaders();
 
         $this->startXML('html',
                         '-//W3C//DTD XHTML 1.0 Strict//EN',
                         'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
 
-        // FIXME: correct language for interface
-
-        $language = common_language();
+        $language = $this->getLanguage();
 
         $this->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
                                           'xml:lang' => $language,
                                           'lang' => $language));
     }
 
+    function getLanguage()
+    {
+        // FIXME: correct language for interface
+        return common_language();
+    }
+
     /**
     *  Ends an HTML document
     *
@@ -134,7 +137,7 @@ class HTMLOutputter extends XMLOutputter
         $this->elementEnd('html');
         $this->endXML();
     }
-    
+
     /**
     *  To specify additional HTTP headers for the action
     *
@@ -172,7 +175,7 @@ class HTMLOutputter extends XMLOutputter
                        'type' => 'text',
                        'id' => $id);
         if ($value) {
-            $attrs['value'] = htmlspecialchars($value);
+            $attrs['value'] = $value;
         }
         $this->element('input', $attrs);
         if ($instructions) {
@@ -206,7 +209,7 @@ class HTMLOutputter extends XMLOutputter
                        'class' => 'checkbox',
                        'id' => $id);
         if ($value) {
-            $attrs['value'] = htmlspecialchars($value);
+            $attrs['value'] = $value;
         }
         if ($checked) {
             $attrs['checked'] = 'checked';
@@ -255,7 +258,7 @@ class HTMLOutputter extends XMLOutputter
         foreach ($content as $value => $option) {
             if ($value == $selected) {
                 $this->element('option', array('value' => $value,
-                                               'selected' => $value),
+                                               'selected' => 'selected'),
                                $option);
             } else {
                 $this->element('option', array('value' => $value), $option);
diff --git a/lib/imagefile.php b/lib/imagefile.php
index 7f1db892c..0c93b257e 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -47,67 +47,196 @@ if (!defined('LACONICA')) {
 
 class ImageFile
 {
-    var $filename = null;
-    var $barename = null;
-    var $type = null;
-    var $height = null;
-    var $width = null;
+    var $id;
+    var $filepath;
+    var $barename;
+    var $type;
+    var $height;
+    var $width;
 
-    function __construct($filename=null, $type=null, $width=null, $height=null)
+    function __construct($id=null, $filepath=null, $type=null, $width=null, $height=null)
     {
-        $this->filename = $filename;
-        $this->type = $type;
-        $this->width = $type;
-        $this->height = $type;
+        $this->id = $id;
+        $this->filepath = $filepath;
+
+        $info = @getimagesize($this->filepath);
+        $this->type = ($info) ? $info[2]:$type;
+        $this->width = ($info) ? $info[0]:$width;
+        $this->height = ($info) ? $info[1]:$height;
     }
 
     static function fromUpload($param='upload')
     {
         switch ($_FILES[$param]['error']) {
-        case UPLOAD_ERR_OK: // success, jump out
+         case UPLOAD_ERR_OK: // success, jump out
             break;
-        case UPLOAD_ERR_INI_SIZE:
-        case UPLOAD_ERR_FORM_SIZE:
-            throw new Exception(_('That file is too big.'));
+         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.'), $this->maxFileSize()));
             return;
-        case UPLOAD_ERR_PARTIAL:
+         case UPLOAD_ERR_PARTIAL:
             @unlink($_FILES[$param]['tmp_name']);
             throw new Exception(_('Partial upload.'));
             return;
-        default:
+         default:
             throw new Exception(_('System error uploading file.'));
             return;
         }
 
-        $imagefile = new ImageFile($_FILES[$param]['tmp_name']);
-        $info = @getimagesize($imagefile->filename);
+        $info = @getimagesize($_FILES[$param]['tmp_name']);
 
         if (!$info) {
-            @unlink($imagefile->filename);
+            @unlink($_FILES[$param]['tmp_name']);
             throw new Exception(_('Not an image or corrupt file.'));
             return;
         }
 
-        $imagefile->width = $info[0];
-        $imagefile->height = $info[1];
+        if ($info[2] !== IMAGETYPE_GIF &&
+            $info[2] !== IMAGETYPE_JPEG &&
+            $info[2] !== IMAGETYPE_PNG) {
 
-        switch ($info[2]) {
-        case IMAGETYPE_GIF:
-        case IMAGETYPE_JPEG:
-        case IMAGETYPE_PNG:
-            $imagefile->type = $info[2];
-            break;
-        default:
-            @unlink($imagefile->filename);
+            @unlink($_FILES[$param]['tmp_name']);
             throw new Exception(_('Unsupported image file format.'));
             return;
         }
 
-        return $imagefile;
+        return new ImageFile(null, $_FILES[$param]['tmp_name']);
+    }
+
+    function resize($size, $x = 0, $y = 0, $w = null, $h = null)
+    {
+        $w = ($w === null) ? $this->width:$w;
+        $h = ($h === null) ? $this->height:$h;
+
+        if (!file_exists($this->filepath)) {
+            throw new Exception(_('Lost our file.'));
+            return;
+        }
+
+        // Don't crop/scale if it isn't necessary
+        if ($size === $this->width
+            && $size === $this->height
+            && $x === 0
+            && $y === 0
+            && $w === $this->width
+            && $h === $this->height) {
+
+            $outname = Avatar::filename($this->id,
+                                        image_type_to_extension($this->type),
+                                        $size,
+                                        common_timestamp());
+            $outpath = Avatar::path($outname);
+            @copy($this->filepath, $outpath);
+            return $outname;
+        }
+
+        switch ($this->type) {
+         case IMAGETYPE_GIF:
+            $image_src = imagecreatefromgif($this->filepath);
+            break;
+         case IMAGETYPE_JPEG:
+            $image_src = imagecreatefromjpeg($this->filepath);
+            break;
+         case IMAGETYPE_PNG:
+            $image_src = imagecreatefrompng($this->filepath);
+            break;
+         default:
+            throw new Exception(_('Unknown file type'));
+            return;
+        }
+
+        $image_dest = imagecreatetruecolor($size, $size);
+
+        if ($this->type == IMAGETYPE_GIF || $this->type == IMAGETYPE_PNG) {
+
+            $transparent_idx = imagecolortransparent($image_src);
+
+            if ($transparent_idx >= 0) {
+
+                $transparent_color = imagecolorsforindex($image_src, $transparent_idx);
+                $transparent_idx = imagecolorallocate($image_dest, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']);
+                imagefill($image_dest, 0, 0, $transparent_idx);
+                imagecolortransparent($image_dest, $transparent_idx);
+
+            } elseif ($this->type == IMAGETYPE_PNG) {
+
+                imagealphablending($image_dest, false);
+                $transparent = imagecolorallocatealpha($image_dest, 0, 0, 0, 127);
+                imagefill($image_dest, 0, 0, $transparent);
+                imagesavealpha($image_dest, true);
+
+            }
+        }
+
+        imagecopyresampled($image_dest, $image_src, 0, 0, $x, $y, $size, $size, $w, $h);
+
+        $outname = Avatar::filename($this->id,
+                                    image_type_to_extension($this->type),
+                                    $size,
+                                    common_timestamp());
+
+        $outpath = Avatar::path($outname);
+
+        switch ($this->type) {
+         case IMAGETYPE_GIF:
+            imagegif($image_dest, $outpath);
+            break;
+         case IMAGETYPE_JPEG:
+            imagejpeg($image_dest, $outpath, 100);
+            break;
+         case IMAGETYPE_PNG:
+            imagepng($image_dest, $outpath);
+            break;
+         default:
+            throw new Exception(_('Unknown file type'));
+            return;
+        }
+
+        imagedestroy($image_src);
+        imagedestroy($image_dest);
+
+        return $outname;
     }
 
     function unlink()
     {
         @unlink($this->filename);
     }
+
+    static function maxFileSize()
+    {
+        $value = ImageFile::maxFileSizeInt();
+
+        if ($value > 1024 * 1024) {
+            return ($value/(1024*1024)).'Mb';
+        } else if ($value > 1024) {
+            return ($value/(1024)).'kB';
+        } else {
+            return $value;
+        }
+    }
+
+    static function maxFileSizeInt()
+    {
+        return min(ImageFile::strToInt(ini_get('post_max_size')),
+                   ImageFile::strToInt(ini_get('upload_max_filesize')),
+                   ImageFile::strToInt(ini_get('memory_limit')));
+    }
+
+    static function strToInt($str)
+    {
+        $unit = substr($str, -1);
+        $num = substr($str, 0, -1);
+
+        switch(strtoupper($unit)){
+         case 'G':
+            $num *= 1024;
+         case 'M':
+            $num *= 1024;
+         case 'K':
+            $num *= 1024;
+        }
+
+        return $num;
+    }
 }
\ No newline at end of file
diff --git a/lib/jabber.php b/lib/jabber.php
index 84d2a562c..3fbb3e1ab 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -114,7 +114,7 @@ function jabber_connect($resource=null)
         try {
             $conn->connect(true); // true = persistent connection
         } catch (XMPPHP_Exception $e) {
-            common_log(LOG_ERROR, $e->getMessage());
+            common_log(LOG_ERR, $e->getMessage());
             return false;
         }
 
@@ -178,7 +178,7 @@ function jabber_format_entry($profile, $notice)
     $entry .= "<link href='" . htmlspecialchars($profile->profileurl) . "'/>\n";
     $entry .= "<link rel='self' type='application/rss+xml' href='" . $self_url . "'/>\n";
     $entry .= "<author><name>" . $profile->nickname . "</name></author>\n";
-    $entry .= "<icon>" . common_profile_avatar_url($profile, AVATAR_PROFILE_SIZE) . "</icon>\n";
+    $entry .= "<icon>" . $profile->avatarUrl(AVATAR_PROFILE_SIZE) . "</icon>\n";
     $entry .= "</source>\n";
     $entry .= "<title>" . htmlspecialchars($msg) . "</title>\n";
     $entry .= "<summary>" . htmlspecialchars($msg) . "</summary>\n";
@@ -186,6 +186,11 @@ function jabber_format_entry($profile, $notice)
     $entry .= "<id>". $notice->uri . "</id>\n";
     $entry .= "<published>".common_date_w3dtf($notice->created)."</published>\n";
     $entry .= "<updated>".common_date_w3dtf($notice->modified)."</updated>\n";
+    if ($notice->reply_to) {
+        $replyurl = common_local_url('shownotice',
+                                     array('notice' => $notice->reply_to));
+        $entry .= "<link rel='related' href='" . $replyurl . "'/>\n";
+    }
     $entry .= "</entry>\n";
 
     $html  = "\n<html xmlns='http://jabber.org/protocol/xhtml-im'>\n";
@@ -354,12 +359,13 @@ function jabber_broadcast_notice($notice)
 
     // First, get users to whom this is a direct reply
     $user = new User();
-    $user->query('SELECT user.id, user.jabber ' .
-                 'FROM user JOIN reply ON user.id = reply.profile_id ' .
+    $UT = common_config('db','type')=='pgsql'?'"user"':'user';
+    $user->query("SELECT $UT.id, $UT.jabber " .
+                 "FROM $UT JOIN reply ON $UT.id = reply.profile_id " .
                  'WHERE reply.notice_id = ' . $notice->id . ' ' .
-                 'AND user.jabber is not null ' .
-                 'AND user.jabbernotify = 1 ' .
-                 'AND user.jabberreplies = 1 ');
+                 "AND $UT.jabber is not null " .
+                 "AND $UT.jabbernotify = 1 " .
+                 "AND $UT.jabberreplies = 1 ");
 
     while ($user->fetch()) {
         common_log(LOG_INFO,
@@ -375,12 +381,12 @@ function jabber_broadcast_notice($notice)
     // Now, get users subscribed to this profile
 
     $user = new User();
-    $user->query('SELECT user.id, user.jabber ' .
-                 'FROM user JOIN subscription ' .
-                 'ON user.id = subscription.subscriber ' .
+    $user->query("SELECT $UT.id, $UT.jabber " .
+                 "FROM $UT JOIN subscription " .
+                 "ON $UT.id = subscription.subscriber " .
                  'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' .
-                 'AND user.jabber is not null ' .
-                 'AND user.jabbernotify = 1 ' .
+                 "AND $UT.jabber is not null " .
+                 "AND $UT.jabbernotify = 1 " .
                  'AND subscription.jabber = 1 ');
 
     while ($user->fetch()) {
@@ -399,11 +405,13 @@ function jabber_broadcast_notice($notice)
     // Now, get users who have it in their inbox because of groups
 
     $user = new User();
-    $user->query('SELECT user.id, user.jabber ' .
-                 'FROM user JOIN notice_inbox ' .
-                 'ON user.id = notice_inbox.user_id ' .
+    $user->query("SELECT $UT.id, $UT.jabber " .
+                 "FROM $UT JOIN notice_inbox " .
+                 "ON $UT.id = notice_inbox.user_id " .
                  'WHERE notice_inbox.notice_id = ' . $notice->id . ' ' .
-                 'AND notice_inbox.source = 2 ');
+                 'AND notice_inbox.source = 2 ' .
+                 'AND user.jabber is not null ' .
+                 'AND user.jabbernotify = 1 ');
 
     while ($user->fetch()) {
         if (!array_key_exists($user->id, $sent_to)) {
diff --git a/lib/language.php b/lib/language.php
index a73b73f28..79e9030ae 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -94,40 +94,43 @@ function get_nice_language_list()
  * Get a list of all languages that are enabled in the default config
  *
  * This should ONLY be called when setting up the default config in common.php.
- * Any other attempt to get a list of lanugages should instead call
+ * Any other attempt to get a list of languages should instead call
  * common_config('site','languages')
  *
  * @return array mapping of language codes to language info
  */
 function get_all_languages() {
 	return array(
-		'bg' => array('q' => 0.8, 'lang' => 'bg_BG', 'name' => 'Bulgarian', 'direction' => 'ltr'),
-		'ca'	=> array('q' => 0.5, 'lang' => 'ca_ES', 'name' => 'Catalan', 'direction' => 'ltr'),
-		'cs'	=> array('q' => 0.5, 'lang' => 'cs_CZ', 'name' => 'Czech', 'direction' => 'ltr'),
-		'de'    => array('q' => 0.5, 'lang' => 'de_DE', 'name' => 'German', 'direction' => 'ltr'),
-		'el'    => array('q' => 0.1, 'lang' => 'el',    'name' => 'Greek', 'direction' => 'ltr'),
-		'en-us' => array('q' => 1, 'lang' => 'en_US', 'name' => 'English (US)', 'direction' => 'ltr'),
-		'en-gb' => array('q' => 0.3, 'lang' => 'en_GB', 'name' => 'English (British)', 'direction' => 'ltr'),
-		'en'    => array('q' => 1, 'lang' => 'en',    'name' => 'English', 'direction' => 'ltr'),
-		'es'    => array('q' => 0.5, 'lang' => 'es',    'name' => 'Spanish', 'direction' => 'ltr'),
-		'fr-fr' => array('q' => 0.2, 'lang' => 'fr_FR', 'name' => 'French', 'direction' => 'ltr'),
-		'he'    => array('q' => 0.5, 'lang' => 'he_IL', 'name' => 'Hebrew', 'direction' => 'ltr'),
-		'it'    => array('q' => 0.9, 'lang' => 'it_IT', 'name' => 'Italian', 'direction' => 'rtl'),
-		'jp'	=> array('q' => 0.5, 'lang' => 'ja_JP', 'name' => 'Japanese', 'direction' => 'ltr'),
-#		'ko'    => array('q' => 0, 'lang' => 'ko',    'name' => 'Korean', 'direction' => 'ltr'),
-		'mk'	=> array('q' => 0.5, 'lang' => 'mk_MK', 'name' => 'Macedonian', 'direction' => 'ltr'),
-		'nb'    => array('q' => 0.1, 'lang' => 'nb_NO', 'name' => 'Norwegian (bokmal)', 'direction' => 'ltr'),
-		'nl'    => array('q' => 0.5, 'lang' => 'nl_NL', 'name' => 'Dutch', 'direction' => 'ltr'),
-		'pl'	=> array('q' => 0.5, 'lang' => 'pl_PL', 'name' => 'Polish', 'direction' => 'ltr'),
-#		'pt'    => array('q' => 0, 'lang' => 'pt',    'name' => 'Portuguese', 'direction' => 'ltr'),
-		'pt-br' => array('q' => 0.7, 'lang' => 'pt_BR', 'name' => 'Portuguese Brazil', 'direction' => 'ltr'),
-		'ru'    => array('q' => 0.1, 'lang' => 'ru_RU', 'name' => 'Russian', 'direction' => 'ltr'),
-		'sv'    => array('q' => 0.9, 'lang' => 'sv_SE', 'name' => 'Swedish', 'direction' => 'ltr'),
-		'te'    => array('q' => 0.3, 'lang' => 'te_IN', 'name' => 'Telugu', 'direction' => 'ltr'),
-		'tr'    => array('q' => 0.5, 'lang' => 'tr_TR', 'name' => 'Turkish', 'direction' => 'ltr'),
-		'uk'    => array('q' => 0.7, 'lang' => 'uk_UA', 'name' => 'Ukrainian', 'direction' => 'ltr'),
-		'vi'    => array('q' => 0.7, 'lang' => 'vi_VN', 'name' => 'Vietnamese', 'direction' => 'ltr'),
-		'zh-cn'    => array('q' => 0.9, 'lang' => 'zh_CN', 'name' => 'Chinese (Simplified)', 'direction' => 'ltr'),
-		'zh-hant'    => array('q' => 0.2, 'lang' => 'zh_hant', 'name' => 'Chinese (Taiwanese)', 'direction' => 'ltr'),
+		'bg'      => array('q' => 0.8, 'lang' => 'bg_BG', 'name' => 'Bulgarian', 'direction' => 'ltr'),
+		'ca'      => array('q' => 0.5, 'lang' => 'ca_ES', 'name' => 'Catalan', 'direction' => 'ltr'),
+		'cs'      => array('q' => 0.5, 'lang' => 'cs_CZ', 'name' => 'Czech', 'direction' => 'ltr'),
+		'de'      => array('q' => 0.5, 'lang' => 'de_DE', 'name' => 'German', 'direction' => 'ltr'),
+		'el'      => array('q' => 0.1, 'lang' => 'el',    'name' => 'Greek', 'direction' => 'ltr'),
+		'en-us'   => array('q' => 1, 'lang' => 'en_US', 'name' => 'English (US)', 'direction' => 'ltr'),
+		'en-gb'   => array('q' => 0.3, 'lang' => 'en_GB', 'name' => 'English (British)', 'direction' => 'ltr'),
+		'en'      => array('q' => 1, 'lang' => 'en',    'name' => 'English', 'direction' => 'ltr'),
+		'es'      => array('q' => 0.5, 'lang' => 'es',    'name' => 'Spanish', 'direction' => 'ltr'),
+		'fi'      => array('q' => 0.5, 'lang' => 'fi', 'name' => 'Finnish', 'direction' => 'ltr'),
+		'fr-fr'   => array('q' => 0.2, 'lang' => 'fr_FR', 'name' => 'French', 'direction' => 'ltr'),
+		'he'      => array('q' => 0.5, 'lang' => 'he_IL', 'name' => 'Hebrew', 'direction' => 'rtl'),
+		'it'      => array('q' => 0.9, 'lang' => 'it_IT', 'name' => 'Italian', 'direction' => 'ltr'),
+		'jp'      => array('q' => 0.5, 'lang' => 'ja_JP', 'name' => 'Japanese', 'direction' => 'ltr'),
+#		'ko'      => array('q' => 0, 'lang' => 'ko',    'name' => 'Korean', 'direction' => 'ltr'),
+		'mk'      => array('q' => 0.5, 'lang' => 'mk_MK', 'name' => 'Macedonian', 'direction' => 'ltr'),
+		'nb'      => array('q' => 0.1, 'lang' => 'nb_NO', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
+		'no'      => array('q' => 0.1, 'lang' => 'nb_NO', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
+		'nn'      => array('q' => 0.1, 'lang' => 'nn_NO', 'name' => 'Norwegian (Nynorsk)', 'direction' => 'ltr'),
+		'nl'      => array('q' => 0.5, 'lang' => 'nl_NL', 'name' => 'Dutch', 'direction' => 'ltr'),
+		'pl'      => array('q' => 0.5, 'lang' => 'pl_PL', 'name' => 'Polish', 'direction' => 'ltr'),
+#		'pt'      => array('q' => 0, 'lang' => 'pt',    'name' => 'Portuguese', 'direction' => 'ltr'),
+		'pt-br'   => array('q' => 0.7, 'lang' => 'pt_BR', 'name' => 'Portuguese Brazil', 'direction' => 'ltr'),
+		'ru'      => array('q' => 0.1, 'lang' => 'ru_RU', 'name' => 'Russian', 'direction' => 'ltr'),
+		'sv'      => array('q' => 0.9, 'lang' => 'sv_SE', 'name' => 'Swedish', 'direction' => 'ltr'),
+		'te'      => array('q' => 0.3, 'lang' => 'te_IN', 'name' => 'Telugu', 'direction' => 'ltr'),
+		'tr'      => array('q' => 0.5, 'lang' => 'tr_TR', 'name' => 'Turkish', 'direction' => 'ltr'),
+		'uk'      => array('q' => 0.7, 'lang' => 'uk_UA', 'name' => 'Ukrainian', 'direction' => 'ltr'),
+		'vi'      => array('q' => 0.7, 'lang' => 'vi_VN', 'name' => 'Vietnamese', 'direction' => 'ltr'),
+		'zh-cn'   => array('q' => 0.9, 'lang' => 'zh_CN', 'name' => 'Chinese (Simplified)', 'direction' => 'ltr'),
+		'zh-hant' => array('q' => 0.2, 'lang' => 'zh_hant', 'name' => 'Chinese (Taiwanese)', 'direction' => 'ltr'),
 	);
 }
diff --git a/lib/mail.php b/lib/mail.php
index 5638ae9bf..9fa86de5c 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -246,7 +246,7 @@ function mail_subscribe_notify_profile($listenee, $other)
                           "\n".'Faithfully yours,'."\n".'%7$s.'."\n\n".
                           "----\n".
                           "Change your email address or ".
-                          "notification options at %8$s\n"),
+                          "notification options at ".'%8$s' ."\n"),
                         $long_name,
                         common_config('site', 'name'),
                         $other->profileurl,
@@ -331,12 +331,13 @@ function mail_broadcast_notice_sms($notice)
 
     $user = new User();
 
+    $UT = common_config('db','type')=='pgsql'?'"user"':'user';
     $user->query('SELECT nickname, smsemail, incomingemail ' .
-                 'FROM user JOIN subscription ' .
-                 'ON user.id = subscription.subscriber ' .
+                 "FROM $UT JOIN subscription " .
+                 "ON $UT.id = subscription.subscriber " .
                  'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' .
-                 'AND user.smsemail IS NOT null ' .
-                 'AND user.smsnotify = 1 ' .
+                 "AND $UT.smsemail IS NOT null " .
+                 "AND $UT.smsnotify = 1 " .
                  'AND subscription.sms = 1 ');
 
     while ($user->fetch()) {
@@ -572,3 +573,53 @@ function mail_notify_fave($other, $user, $notice)
     common_init_locale();
     mail_to_user($other, $subject, $body);
 }
+
+/**
+ * notify a user that they have received an "attn:" message AKA "@-reply"
+ *
+ * @param User   $user   The user who recevied the notice
+ * @param Notice $notice The notice that was sent
+ *
+ * @return void
+ */
+
+function mail_notify_attn($user, $notice)
+{
+    if (!$user->email || !$user->emailnotifyattn) {
+        return;
+    }
+
+    $sender = $notice->getProfile();
+
+    $bestname = $sender->getBestName();
+
+    common_init_locale($user->language);
+
+    $subject = sprintf(_('%s sent a notice to your attention'), $bestname);
+
+    $body = sprintf(_("%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"),
+                    $bestname,
+                    common_config('site', 'name'),
+                    common_local_url('shownotice',
+                                     array('notice' => $notice->id)),
+                    $notice->content,
+                    common_local_url('newnotice',
+                                     array('replyto' => $sender->nickname)),
+                    common_local_url('replies',
+                                     array('nickname' => $user->nickname)),
+                    common_local_url('emailsettings'));
+
+    common_init_locale();
+    mail_to_user($user, $subject, $body);
+}
diff --git a/lib/mailbox.php b/lib/mailbox.php
index 8d5d44e49..d77234549 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -63,6 +63,8 @@ class MailboxAction extends PersonalAction
             $this->page = 1;
         }
 
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
@@ -181,8 +183,8 @@ class MailboxAction extends PersonalAction
                                        'class' => 'url'));
         $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
         $this->element('img', array('src' => ($avatar) ?
-                                    common_avatar_display_url($avatar) :
-                                    common_default_avatar(AVATAR_STREAM_SIZE),
+                                    $avatar->displayUrl() :
+                                    Avatar::defaultImage(AVATAR_STREAM_SIZE),
                                     'class' => 'photo avatar',
                                     'width' => AVATAR_STREAM_SIZE,
                                     'height' => AVATAR_STREAM_SIZE,
diff --git a/lib/messageform.php b/lib/messageform.php
index 61d3d75af..f41508305 100644
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -99,7 +99,6 @@ class MessageForm extends Form
         return common_local_url('newmessage');
     }
 
-
     /**
      * Legend of the Form
      *
@@ -110,7 +109,6 @@ class MessageForm extends Form
         $this->out->element('legend', null, _('Send a direct notice'));
     }
 
-
     /**
      * Data elements
      *
@@ -137,7 +135,7 @@ class MessageForm extends Form
         $this->out->elementStart('ul', 'form_data');
         $this->out->elementStart('li', array('id' => 'notice_to'));
         $this->out->dropdown('to', _('To'), $mutual, null, false,
-                             $this->to->id);
+                             ($this->to) ? $this->to->id : null);
         $this->out->elementEnd('li');
 
         $this->out->elementStart('li', array('id' => 'notice_text'));
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 20bf3c9f1..9fc0126b3 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -203,11 +203,14 @@ class NoticeListItem extends Widget
 
     function showNoticeOptions()
     {
-        $this->out->elementStart('div', 'notice-options');
-        $this->showFaveForm();
-        $this->showReplyLink();
-        $this->showDeleteLink();
-        $this->out->elementEnd('div');
+        $user = common_current_user();
+        if ($user) {
+            $this->out->elementStart('div', 'notice-options');
+            $this->showFaveForm();
+            $this->showReplyLink();
+            $this->showDeleteLink();
+            $this->out->elementEnd('div');
+        }
     }
 
     /**
@@ -282,8 +285,8 @@ class NoticeListItem extends Widget
         $avatar = $this->profile->getAvatar($avatar_size);
 
         $this->out->element('img', array('src' => ($avatar) ?
-                                         common_avatar_display_url($avatar) :
-                                         common_default_avatar($avatar_size),
+                                         $avatar->displayUrl() :
+                                         Avatar::defaultImage($avatar_size),
                                          'class' => 'avatar photo',
                                          'width' => $avatar_size,
                                          'height' => $avatar_size,
@@ -440,19 +443,21 @@ class NoticeListItem extends Widget
 
     function showReplyLink()
     {
-        $reply_url = common_local_url('newnotice',
-                                      array('replyto' => $this->profile->nickname));
-
-        $this->out->elementStart('dl', 'notice_reply');
-        $this->out->element('dt', null, _('Reply to this notice'));
-        $this->out->elementStart('dd');
-        $this->out->elementStart('a', array('href' => $reply_url,
-                                       'title' => _('Reply to this notice')));
-        $this->out->text(_('Reply'));
-        $this->out->element('span', 'notice_id', $this->notice->id);
-        $this->out->elementEnd('a');
-        $this->out->elementEnd('dd');
-        $this->out->elementEnd('dl');
+        if (common_logged_in()) {
+            $reply_url = common_local_url('newnotice',
+                                          array('replyto' => $this->profile->nickname));
+
+            $this->out->elementStart('dl', 'notice_reply');
+            $this->out->element('dt', null, _('Reply to this notice'));
+            $this->out->elementStart('dd');
+            $this->out->elementStart('a', array('href' => $reply_url,
+                                                'title' => _('Reply to this notice')));
+            $this->out->text(_('Reply'));
+            $this->out->element('span', 'notice_id', $this->notice->id);
+            $this->out->elementEnd('a');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
+        }
     }
 
     /**
diff --git a/lib/noticesection.php b/lib/noticesection.php
index aa8e03229..94c2738ef 100644
--- a/lib/noticesection.php
+++ b/lib/noticesection.php
@@ -73,6 +73,11 @@ class NoticeSection extends Section
     function showNotice($notice)
     {
         $profile = $notice->getProfile();
+        if (empty($profile)) {
+            common_log(LOG_WARNING, sprintf("Notice %d has no profile",
+                                            $notice->id));
+            return;
+        }
         $this->out->elementStart('li', 'hentry notice');
         $this->out->elementStart('div', 'entry-title');
         $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
@@ -82,7 +87,7 @@ class NoticeSection extends Section
                                             $profile->nickname,
                                             'href' => $profile->profileurl,
                                             'class' => 'url'));
-        $this->out->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
+        $this->out->element('img', array('src' => (($avatar) ? $avatar->displayUrl() :  Avatar::defaultImage(AVATAR_MINI_SIZE)),
                                          'width' => AVATAR_MINI_SIZE,
                                          'height' => AVATAR_MINI_SIZE,
                                          'class' => 'avatar photo',
@@ -96,7 +101,7 @@ class NoticeSection extends Section
         $this->out->elementStart('p', 'entry-content');
         $this->out->raw($notice->rendered);
         $this->out->elementEnd('p');
-        if ($notice->value) {
+        if (!empty($notice->value)) {
             $this->out->elementStart('p');
             $this->out->text($notice->value);
             $this->out->elementEnd('p');
diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index 7ad3be20e..9af05ea2d 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -63,7 +63,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore
         if ($n->find(true)) {
             return true;
         } else {
-            $n->timestamp = $timestamp;
+            $n->ts = $timestamp;
             $n->created = DB_DataObject_Cast::dateTime();
             $n->insert();
             return false;
diff --git a/lib/omb.php b/lib/omb.php
index f2dbef5ba..befcf4666 100644
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -206,7 +206,7 @@ function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret)
 
     $result = $fetcher->post($req->get_normalized_http_url(),
                              $req->to_postdata(),
-                             array('User-Agent' => 'Laconica/' . LACONICA_VERSION));
+                             array('User-Agent: Laconica/' . LACONICA_VERSION));
 
     common_debug('Got HTTP result "'.print_r($result,true).'"', __FILE__);
 
@@ -239,7 +239,7 @@ function omb_broadcast_profile($profile)
         while ($sub->fetch()) {
             $rp = Remote_profile::staticGet('id', $sub->subscriber);
             if ($rp) {
-                if (!$updated[$rp->updateprofileurl]) {
+                if (!array_key_exists($rp->updateprofileurl, $updated)) {
                     if (omb_update_profile($profile, $rp, $sub)) {
                         $updated[$rp->updateprofileurl] = true;
                     }
@@ -291,11 +291,13 @@ function omb_update_profile($profile, $remote_profile, $subscription)
     common_debug('postdata = '.$req->to_postdata(), __FILE__);
     $result = $fetcher->post($req->get_normalized_http_url(),
                              $req->to_postdata(),
-                             array('User-Agent' => 'Laconica/' . LACONICA_VERSION));
+                             array('User-Agent: Laconica/' . LACONICA_VERSION));
 
     common_debug('Got HTTP result "'.print_r($result,true).'"', __FILE__);
 
-    if ($result->status == 403) { # not authorized, don't send again
+    if (empty($result) || $result) {
+        common_debug("Unable to contact " . $req->get_normalized_http_url());
+    } else if ($result->status == 403) { # not authorized, don't send again
         common_debug('403 result, deleting subscription', __FILE__);
         $subscription->delete();
         return false;
diff --git a/lib/openid.php b/lib/openid.php
index 860573702..5c3d460da 100644
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -64,6 +64,9 @@ function oid_set_last($openid_url)
 
 function oid_get_last()
 {
+    if (empty($_COOKIE[OPENID_COOKIE_KEY])) {
+        return null;
+    }
     $openid_url = $_COOKIE[OPENID_COOKIE_KEY];
     if ($openid_url && strlen($openid_url) > 0) {
         return $openid_url;
diff --git a/lib/peoplesearchresults.php b/lib/peoplesearchresults.php
new file mode 100644
index 000000000..f8ab7cf3b
--- /dev/null
+++ b/lib/peoplesearchresults.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * People search results class
+ *
+ * PHP version 5
+ *
+ * @category Widget
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ *
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/profilelist.php';
+
+/**
+ * People search results class
+ *
+ * Derivative of ProfileList with specialization for highlighting search terms.
+ *
+ * @category Widget
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ *
+ * @see PeoplesearchAction
+ */
+
+class PeopleSearchResults extends ProfileList
+{
+    var $terms = null;
+    var $pattern = null;
+
+    function __construct($profile, $terms, $action)
+    {
+        parent::__construct($profile, $terms, $action);
+        $this->terms = array_map('preg_quote',
+                                 array_map('htmlspecialchars', $terms));
+        $this->pattern = '/('.implode('|',$terms).')/i';
+    }
+
+    function highlight($text)
+    {
+        return preg_replace($this->pattern, '<strong>\\1</strong>', htmlspecialchars($text));
+    }
+
+    function isReadOnly()
+    {
+        return true;
+    }
+}
+
diff --git a/lib/personal.php b/lib/personal.php
index 900df0257..e46350c63 100644
--- a/lib/personal.php
+++ b/lib/personal.php
@@ -55,7 +55,6 @@ class PersonalAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        common_set_returnto($this->selfUrl());
     }
 
 }
diff --git a/lib/personaltagcloudsection.php b/lib/personaltagcloudsection.php
index 0882822db..978153a84 100644
--- a/lib/personaltagcloudsection.php
+++ b/lib/personaltagcloudsection.php
@@ -58,8 +58,14 @@ class PersonalTagCloudSection extends TagCloudSection
 
     function getTags()
     {
-        $qry = 'SELECT notice_tag.tag, '.
-          'sum(exp(-(now() - notice_tag.created)/%s)) as weight ' .
+        if (common_config('db', 'type') == 'pgsql') {
+            $weightexpr='sum(exp(-extract(epoch from (now() - notice_tag.created)) / %s))';
+        } else {
+            $weightexpr='sum(exp(-(now() - notice_tag.created) / %s))';
+        }
+ 
+       $qry = 'SELECT notice_tag.tag, '.
+          $weightexpr . ' as weight ' .
           'FROM notice_tag JOIN notice ' .
           'ON notice_tag.notice_id = notice.id ' .
           'WHERE notice.profile_id = %d ' .
diff --git a/lib/plugin.php b/lib/plugin.php
new file mode 100644
index 000000000..7b2436e54
--- /dev/null
+++ b/lib/plugin.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Utility class for plugins
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Base class for plugins
+ *
+ * A base class for Laconica plugins. Mostly a light wrapper around
+ * the Event framework.
+ *
+ * Subclasses of Plugin will automatically handle an event if they define
+ * a method called "onEventName". (Well, OK -- only if they call parent::__construct()
+ * in their constructors.)
+ *
+ * They will also automatically handle the InitializePlugin and CleanupPlugin with the
+ * initialize() and cleanup() methods, respectively.
+ *
+ * @category Plugin
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      Event
+ */
+
+class Plugin
+{
+    function __construct()
+    {
+        Event::addHandler('InitializePlugin', array($this, 'initialize'));
+        Event::addHandler('CleanupPlugin', array($this, 'cleanup'));
+
+        foreach (get_class_methods($this) as $method) {
+            if (mb_substr($method, 0, 2) == 'on') {
+                Event::addHandler(mb_substr($method, 2), array($this, $method));
+            }
+        }
+    }
+
+    function initialize()
+    {
+        return true;
+    }
+
+    function cleanup()
+    {
+        return true;
+    }
+}
diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index 89daaa563..0505f0fa9 100644
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -31,8 +31,6 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-define('NOTICES_PER_SECTION', 6);
-
 /**
  * Base class for sections showing lists of notices
  *
@@ -50,10 +48,18 @@ class PopularNoticeSection extends NoticeSection
 {
     function getNotices()
     {
+        if (common_config('db', 'type') == 'pgsql') {
+            $weightexpr='sum(exp(-extract(epoch from (now() - fave.modified)) / %s))';
+        } else {
+            $weightexpr='sum(exp(-(now() - fave.modified) / %s))';
+        }
+
         $qry = 'SELECT notice.*, '.
-          'sum(exp(-(now() - fave.modified) / %s)) as weight ' .
+          $weightexpr . ' as weight ' .
           'FROM notice JOIN fave ON notice.id = fave.notice_id ' .
-          'GROUP BY fave.notice_id ' .
+          'GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' .
+                   'notice.rendered,notice.url,notice.created,notice.modified,' .
+                   'notice.reply_to,notice.is_local,notice.source ' .
           'ORDER BY weight DESC';
 
         $offset = 0;
@@ -80,4 +86,9 @@ class PopularNoticeSection extends NoticeSection
     {
         return 'popular_notices';
     }
+
+    function moreUrl()
+    {
+        return common_local_url('favorited');
+    }
 }
diff --git a/lib/profilelist.php b/lib/profilelist.php
index 499d74f7b..c2040fbc2 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -34,8 +34,6 @@ if (!defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/widget.php';
 
-define('PROFILES_PER_PAGE', 20);
-
 /**
  * Widget to show a list of profiles
  *
@@ -97,7 +95,7 @@ class ProfileList extends Widget
         $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
         $this->out->elementStart('a', array('href' => $this->profile->profileurl,
                                             'class' => 'url'));
-        $this->out->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
+        $this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE),
                                          'class' => 'photo avatar',
                                          'width' => AVATAR_STREAM_SIZE,
                                          'height' => AVATAR_STREAM_SIZE,
@@ -123,7 +121,7 @@ class ProfileList extends Widget
         if ($this->profile->location) {
             $this->out->elementStart('dl', 'entity_location');
             $this->out->element('dt', null, _('Location'));
-            $this->out->elementStart('dd', 'location');
+            $this->out->elementStart('dd', 'label');
             $this->out->raw($this->highlight($this->profile->location));
             $this->out->elementEnd('dd');
             $this->out->elementEnd('dl');
@@ -191,9 +189,14 @@ class ProfileList extends Widget
 
         $this->out->elementEnd('div');
 
+        $this->out->elementStart('div', 'entity_actions');
+
+        $this->out->elementStart('ul');
+
         if ($user && $user->id != $this->profile->id) {
             # XXX: special-case for user looking at own
             # subscriptions page
+            $this->out->elementStart('li', 'entity_subscribe');
             if ($user->isSubscribed($this->profile)) {
                 $usf = new UnsubscribeForm($this->out, $this->profile);
                 $usf->show();
@@ -201,8 +204,18 @@ class ProfileList extends Widget
                 $sf = new SubscribeForm($this->out, $this->profile);
                 $sf->show();
             }
+            $this->out->elementEnd('li');
+            $this->out->elementStart('li', 'entity_block');
+            if ($user && $user->id == $this->owner->id) {
+                $this->showBlockForm();
+            }
+            $this->out->elementEnd('li');
         }
 
+        $this->out->elementEnd('ul');
+
+        $this->out->elementEnd('div');
+
         $this->out->elementEnd('li');
     }
 
@@ -217,4 +230,8 @@ class ProfileList extends Widget
     {
         return htmlspecialchars($text);
     }
+
+    function showBlockForm()
+    {
+    }
 }
diff --git a/lib/profileminilist.php b/lib/profileminilist.php
index 56b768419..0d466bba8 100644
--- a/lib/profileminilist.php
+++ b/lib/profileminilist.php
@@ -69,14 +69,12 @@ class ProfileMiniList extends ProfileList
     function showProfile()
     {
         $this->out->elementStart('li', 'vcard');
-        $this->out->elementStart('a', array('title' => ($this->profile->fullname) ?
-                                       $this->profile->fullname :
-                                       $this->profile->nickname,
+        $this->out->elementStart('a', array('title' => $this->profile->getBestName(),
                                        'href' => $this->profile->profileurl,
                                        'rel' => 'contact member',
                                        'class' => 'url'));
         $avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE);
-        $this->out->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
+        $this->out->element('img', array('src' => (($avatar) ? $avatar->displayUrl() :  Avatar::defaultImage(AVATAR_MINI_SIZE)),
                                     'width' => AVATAR_MINI_SIZE,
                                     'height' => AVATAR_MINI_SIZE,
                                     'class' => 'avatar photo',
diff --git a/lib/profilesection.php b/lib/profilesection.php
index 3642ae164..8ed290e03 100644
--- a/lib/profilesection.php
+++ b/lib/profilesection.php
@@ -86,7 +86,7 @@ class ProfileSection extends Section
                                        'rel' => 'contact member',
                                        'class' => 'url'));
         $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
-        $this->out->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
+        $this->out->element('img', array('src' => (($avatar) ? $avatar->displayUrl() :  Avatar::defaultImage(AVATAR_MINI_SIZE)),
                                     'width' => AVATAR_MINI_SIZE,
                                     'height' => AVATAR_MINI_SIZE,
                                     'class' => 'avatar photo',
diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index d72475e20..485d25e20 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -39,6 +39,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @category Output
  * @package  Laconica
  * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://laconi.ca/
  *
@@ -73,23 +74,26 @@ class PublicGroupNav extends Widget
 
         $this->action->elementStart('ul', array('class' => 'nav'));
 
-        $this->out->menuItem(common_local_url('public'), _('Public'),
-            _('Public timeline'), $action_name == 'public', 'nav_timeline_public');
+        if (Event::handle('StartPublicGroupNav', array($this))) {
+            $this->out->menuItem(common_local_url('public'), _('Public'),
+                _('Public timeline'), $action_name == 'public', 'nav_timeline_public');
 
-        $this->out->menuItem(common_local_url('groups'), _('Groups'),
-            _('User groups'), $action_name == 'groups', 'nav_groups');
+            $this->out->menuItem(common_local_url('groups'), _('Groups'),
+                _('User groups'), $action_name == 'groups', 'nav_groups');
 
-        $this->out->menuItem(common_local_url('publictagcloud'), _('Recent tags'),
-            _('Recent tags'), $action_name == 'publictagcloud', 'nav_recent-tags');
+            $this->out->menuItem(common_local_url('publictagcloud'), _('Recent tags'),
+                _('Recent tags'), $action_name == 'publictagcloud', 'nav_recent-tags');
 
-        if (count(common_config('nickname', 'featured')) > 0) {
-            $this->out->menuItem(common_local_url('featured'), _('Featured'),
-                _('Featured users'), $action_name == 'featured', 'nav_featured');
-        }
+            if (count(common_config('nickname', 'featured')) > 0) {
+                $this->out->menuItem(common_local_url('featured'), _('Featured'),
+                    _('Featured users'), $action_name == 'featured', 'nav_featured');
+            }
 
-        $this->out->menuItem(common_local_url('favorited'), _('Popular'),
-            _("Popular notices"), $action_name == 'favorited', 'nav_timeline_favorited');
+            $this->out->menuItem(common_local_url('favorited'), _('Popular'),
+                _("Popular notices"), $action_name == 'favorited', 'nav_timeline_favorited');
 
+            Event::handle('EndPublicGroupNav', array($this));
+        }
         $this->action->elementEnd('ul');
     }
 }
diff --git a/lib/router.php b/lib/router.php
new file mode 100644
index 000000000..41c376a72
--- /dev/null
+++ b/lib/router.php
@@ -0,0 +1,438 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * URL routing utilities
+ *
+ * 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  URL
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once 'Net/URL/Mapper.php';
+
+/**
+ * URL Router
+ *
+ * Cheap wrapper around Net_URL_Mapper
+ *
+ * @category URL
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class Router
+{
+    var $m = null;
+    static $inst = null;
+
+    static function get()
+    {
+        if (!Router::$inst) {
+            Router::$inst = new Router();
+        }
+        return Router::$inst;
+    }
+
+    function __construct()
+    {
+        if (!$this->m) {
+            $this->m = $this->initialize();
+        }
+    }
+
+    function initialize() {
+
+        $m = Net_URL_Mapper::getInstance();
+
+        // In the "root"
+
+        $m->connect('', array('action' => 'public'));
+        $m->connect('rss', array('action' => 'publicrss'));
+        $m->connect('xrds', array('action' => 'publicxrds'));
+        $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'));
+
+        // docs
+
+        $m->connect('doc/:title', array('action' => 'doc'));
+
+        // facebook
+
+        $m->connect('facebook', array('action' => 'facebookhome'));
+        $m->connect('facebook/index.php', array('action' => 'facebookhome'));
+        $m->connect('facebook/settings.php', array('action' => 'facebooksettings'));
+        $m->connect('facebook/invite.php', array('action' => 'facebookinvite'));
+        $m->connect('facebook/remove', array('action' => 'facebookremove'));
+
+        // main stuff is repetitive
+
+        $main = array('login', 'logout', 'register', 'subscribe',
+                      'unsubscribe', 'confirmaddress', 'recoverpassword',
+                      'invite', 'favor', 'disfavor', 'sup',
+                      'block');
+
+        foreach ($main as $a) {
+            $m->connect('main/'.$a, array('action' => $a));
+        }
+
+        $m->connect('main/tagother/:id', array('action' => 'tagother'));
+
+        // these take a code
+
+        foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
+            $m->connect('main/'.$c.'/:code', array('action' => $c));
+        }
+
+        // exceptional
+
+        $m->connect('main/openid', array('action' => 'openidlogin'));
+        $m->connect('main/remote', array('action' => 'remotesubscribe'));
+        $m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '[A-Za-z0-9_-]+'));
+
+        foreach (array('requesttoken', 'accesstoken', 'userauthorization',
+                    'postnotice', 'updateprofile', 'finishremotesubscribe') as $action) {
+            $m->connect('index.php?action=' . $action, array('action' => $action));
+        }
+
+        // settings
+
+        foreach (array('profile', 'avatar', 'password', 'openid', 'im',
+                       'email', 'sms', 'twitter', 'other') as $s) {
+            $m->connect('settings/'.$s, array('action' => $s.'settings'));
+        }
+
+        // search
+
+        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('search/notice/rss', array('action' => 'noticesearchrss'));
+
+        // notice
+
+        $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/: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('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' => '[a-zA-Z0-9]+'));
+
+        $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') as $n) {
+            $m->connect('group/:nickname/'.$n,
+                        array('action' => 'group'.$n),
+                        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/:method',
+                    array('action' => 'api',
+                          'apiaction' => 'statuses'),
+                    array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|friends|followers|featured)(\.(atom|rss|xml|json))?'));
+
+        $m->connect('api/statuses/:method/:argument',
+                    array('action' => 'api',
+                          'apiaction' => 'statuses'),
+                    array('method' => '(user_timeline|friends_timeline|show|destroy|friends|followers)'));
+
+        // users
+
+        $m->connect('api/users/:method/:argument',
+                    array('action' => 'api',
+                          'apiaction' => 'users'),
+                    array('method' => 'show(\.(xml|json))?'));
+
+        $m->connect('api/users/:method',
+                    array('action' => 'api',
+                          'apiaction' => 'users'),
+                    array('method' => 'show(\.(xml|json))?'));
+
+        // direct messages
+
+        foreach (array('xml', 'json') as $e) {
+            $m->connect('api/direct_messages/new.'.$e,
+                        array('action' => 'api',
+                              'apiaction' => 'direct_messages',
+                              'method' => 'create.'.$e));
+        }
+
+        foreach (array('xml', 'json', 'rss', 'atom') as $e) {
+            $m->connect('api/direct_messages.'.$e,
+                        array('action' => 'api',
+                              'apiaction' => 'direct_messages',
+                              'method' => 'direct_messages.'.$e));
+        }
+
+        foreach (array('xml', 'json', 'rss', 'atom') as $e) {
+            $m->connect('api/direct_message/sent.'.$e,
+                        array('action' => 'api',
+                        'apiaction' => 'direct_messages',
+                        'method' => 'sent.'.$e));
+        }
+
+        $m->connect('api/direct_messages/destroy/:argument',
+                    array('action' => 'api',
+                          'apiaction' => 'direct_messages'));
+
+        // friendships
+
+        $m->connect('api/friendships/:method/:argument',
+                    array('action' => 'api',
+                          'apiaction' => 'friendships'),
+                    array('method' => '(create|destroy)'));
+
+        $m->connect('api/friendships/:method',
+                    array('action' => 'api',
+                          'apiaction' => 'friendships'),
+                    array('method' => 'exists(\.(xml|json|rss|atom))'));
+
+
+        // Social graph
+
+        $m->connect('api/friends/ids/:argument',
+                    array('action' => 'api',
+                          'apiaction' => 'statuses',
+                          'method' => 'friendsIDs'));
+
+        foreach (array('xml', 'json') as $e) {
+            $m->connect('api/friends/ids.'.$e,
+                        array('action' => 'api',
+                              'apiaction' => 'statuses',
+                              'method' => 'friendsIDs.'.$e));
+        }
+
+        $m->connect('api/followers/ids/:argument',
+                    array('action' => 'api',
+                          'apiaction' => 'statuses',
+                          'method' => 'followersIDs'));
+
+        foreach (array('xml', 'json') as $e) {
+            $m->connect('api/followers/ids.'.$e,
+                        array('action' => 'api',
+                              'apiaction' => 'statuses',
+                              'method' => 'followersIDs.'.$e));
+        }
+
+        // account
+
+        $m->connect('api/account/:method',
+                    array('action' => 'api',
+                          'apiaction' => 'account'));
+
+        // favorites
+
+        $m->connect('api/favorites/:method/:argument',
+                    array('action' => 'api',
+                          'apiaction' => 'favorites'));
+
+        $m->connect('api/favorites/:argument',
+                    array('action' => 'api',
+                          'apiaction' => 'favorites',
+                          'method' => 'favorites'));
+
+        foreach (array('xml', 'json', 'rss', 'atom') as $e) {
+            $m->connect('api/favorites.'.$e,
+                array('action' => 'api',
+                      'apiaction' => 'favorites',
+                      'method' => 'favorites.'.$e));
+        }
+
+        // notifications
+
+        $m->connect('api/notifications/:method/:argument',
+                    array('action' => 'api',
+                          'apiaction' => 'favorites'));
+
+        // blocks
+
+        $m->connect('api/blocks/:method/:argument',
+                    array('action' => 'api',
+                          'apiaction' => 'blocks'));
+
+        // help
+
+        $m->connect('api/help/:method',
+                    array('action' => 'api',
+                          'apiaction' => 'help'));
+
+        // laconica
+
+        $m->connect('api/laconica/:method',
+                    array('action' => 'api',
+                          'apiaction' => 'laconica'));
+
+
+        // search
+
+        foreach (array('json', 'atom') as $e) {
+            $m->connect('api/search.'.$e,
+                        array('action' => 'twitapisearch'));
+        }
+
+        $m->connect('api/trends.json', array('action' => 'twitapitrends'));
+
+        // user stuff
+
+        foreach (array('subscriptions', 'subscribers',
+                       'nudge', 'xrds', 'all', 'foaf',
+                       'replies', 'inbox', 'outbox', 'microsummary') as $a) {
+            $m->connect(':nickname/'.$a,
+                        array('action' => $a),
+                        array('nickname' => '[a-zA-Z0-9]{1,64}'));
+        }
+
+        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}'));
+        }
+
+        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' => '[a-zA-Z0-9]{1,64}'));
+        }
+
+        $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',
+                    array('action' => 'showstream'),
+                    array('nickname' => '[a-zA-Z0-9]{1,64}'));
+
+        Event::handle('RouterInitialized', array($m));
+
+        return $m;
+    }
+
+    function map($path)
+    {
+        try {
+            $match = $this->m->match($path);
+        } catch (Net_URL_Mapper_InvalidException $e) {
+            common_log(LOG_ERR, "Problem getting route for $path - " .
+                $e->getMessage());
+            $cac = new ClientErrorAction("Page not found.", 404);
+            $cac->showPage();
+        }
+
+        return $match;
+    }
+
+    function build($action, $args=null, $params=null, $fragment=null)
+    {
+        $action_arg = array('action' => $action);
+
+        if ($args) {
+            $args = array_merge($action_arg, $args);
+        } else {
+            $args = $action_arg;
+        }
+
+        return $this->m->generate($args, $params, $fragment);
+    }
+}
diff --git a/lib/rssaction.php b/lib/rssaction.php
index f19c8e1c5..66c2d9e8c 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -38,6 +38,7 @@ class Rss10Action extends Action
 
     var $creators = array();
     var $limit = DEFAULT_RSS_LIMIT;
+    var $notices = null;
 
     /**
      * Constructor
@@ -93,6 +94,9 @@ class Rss10Action extends Action
 
     function handle($args)
     {
+        // Get the list of notices
+        $this->notices = $this->getNotices();
+        // Parent handling, including cache check
         parent::handle($args);
         $this->showRss($this->limit);
     }
@@ -178,11 +182,11 @@ class Rss10Action extends Action
         $image = $this->getImage();
         if ($image) {
             $channel = $this->getChannel();
-            common_element_start('image', array('rdf:about' => $image));
-            common_element('title', null, $channel['title']);
-            common_element('link', null, $channel['link']);
-            common_element('url', null, $image);
-            common_element_end('image');
+            $this->elementStart('image', array('rdf:about' => $image));
+            $this->element('title', null, $channel['title']);
+            $this->element('link', null, $channel['link']);
+            $this->element('url', null, $image);
+            $this->elementEnd('image');
         }
     }
 
@@ -199,7 +203,7 @@ class Rss10Action extends Action
         $this->element('dc:date', null, common_date_w3dtf($notice->created));
         $this->element('dc:creator', null, ($profile->fullname) ? $profile->fullname : $profile->nickname);
         $this->element('sioc:has_creator', array('rdf:resource' => $creator_uri));
-        $this->element('laconica:postIcon', array('rdf:resource' => common_profile_avatar_url($profile)));
+        $this->element('laconica:postIcon', array('rdf:resource' => $profile->avatarUrl()));
         $this->element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
         $this->elementEnd('item');
         $this->creators[$creator_uri] = $profile;
@@ -216,7 +220,7 @@ class Rss10Action extends Action
                 $this->element('foaf:name', null, $profile->fullname);
             }
             $this->element('sioc:id', null, $id);
-            $avatar = common_profile_avatar_url($profile);
+            $avatar = $profile->avatarUrl();
             $this->element('sioc:avatar', array('rdf:resource' => $avatar));
             $this->elementEnd('sioc:User');
         }
@@ -258,5 +262,25 @@ class Rss10Action extends Action
     {
         $this->elementEnd('rdf:RDF');
     }
+
+    /**
+     * When was this page last modified?
+     *
+     */
+
+    function lastModified()
+    {
+        if (empty($this->notices)) {
+            return null;
+        }
+
+        if (count($this->notices) == 0) {
+            return null;
+        }
+
+        // FIXME: doesn't handle modified profiles, avatars, deleted notices
+
+        return strtotime($this->notices[0]->created);
+    }
 }
 
diff --git a/lib/searchaction.php b/lib/searchaction.php
index fdfb8dc5a..df6876445 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -79,10 +79,11 @@ class SearchAction extends Action
 
     function showTop($arr=null)
     {
+        $error = null;
         if ($arr) {
             $error = $arr[1];
         }
-        if ($error) {
+        if (!empty($error)) {
             $this->element('p', 'error', $error);
         } else {
             $instr = $this->getInstructions();
diff --git a/lib/section.php b/lib/section.php
index 0c32ddcf8..d14575086 100644
--- a/lib/section.php
+++ b/lib/section.php
@@ -103,6 +103,6 @@ class Section extends Widget
 
     function moreTitle()
     {
-        return null;
+        return _('More...');
     }
 }
diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index a39886591..595dcf147 100644
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/error.php';
  * says that 500 errors should be treated similarly to 400 errors, and
  * it's easier to give an HTML response.  Maybe we can customize these
  * to display some funny animal cartoons.  If not, we can probably role
- * these classes up into a single class. 
+ * these classes up into a single class.
  *
  * See: http://tools.ietf.org/html/rfc2616#section-10
  *
@@ -57,19 +57,19 @@ class ServerErrorAction extends ErrorAction
     function __construct($message='Error', $code=500)
     {
         parent::__construct($message, $code);
-        
+
         $this->status  = array(500 => 'Internal Server Error',
                                501 => 'Not Implemented',
                                502 => 'Bad Gateway',
                                503 => 'Service Unavailable',
                                504 => 'Gateway Timeout',
                                505 => 'HTTP Version Not Supported');
-        
+
         $this->default = 500;
     }
-    
+
     // XXX: Should these error actions even be invokable via URI?
-    
+
     function handle($args)
     {
         parent::handle($args);
@@ -81,12 +81,16 @@ class ServerErrorAction extends ErrorAction
         }
 
         $this->message = $this->trimmed('message');
-        
+
         if (!$this->message) {
-            $this->message = "Server Error $this->code"; 
-        }        
+            $this->message = "Server Error $this->code";
+        }
 
         $this->showPage();
     }
-     
+
+    function title()
+    {
+        return $this->status[$this->code];
+    }
 }
diff --git a/lib/serverexception.php b/lib/serverexception.php
new file mode 100644
index 000000000..b8ed6846e
--- /dev/null
+++ b/lib/serverexception.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * class for a server exception (user error)
+ *
+ * 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  Exception
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Class for server exceptions
+ *
+ * Subclass of PHP Exception for server errors. The user typically can't fix these.
+ *
+ * @category Exception
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class ServerException extends Exception
+{
+    public function __construct($message = null, $code = 400) {
+        parent::__construct($message, $code);
+    }
+
+    public function __toString() {
+        return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
+    }
+}
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index dfe1f114b..53c807c6f 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -76,7 +76,12 @@ class SettingsAction extends Action
             // change important settings or see private info, and
             // _all_ our settings are important
             common_set_returnto($this->selfUrl());
-            common_redirect(common_local_url('login'));
+            $user = common_current_user();
+            if ($user->hasOpenID()) {
+                common_redirect(common_local_url('openidlogin'));
+            } else {
+                common_redirect(common_local_url('login'));
+            }
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->handlePost();
         } else {
diff --git a/lib/twitter.php b/lib/twitter.php
index 197298549..deb6fd276 100644
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -19,6 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
+define("TWITTER_SERVICE", 1); // Twitter is foreign_service ID 1
+
 function get_twitter_data($uri, $screen_name, $password)
 {
 
@@ -28,14 +30,13 @@ function get_twitter_data($uri, $screen_name, $password)
             CURLOPT_FAILONERROR        => true,
             CURLOPT_HEADER            => false,
             CURLOPT_FOLLOWLOCATION    => true,
-            # CURLOPT_USERAGENT        => "identi.ca",
+            CURLOPT_USERAGENT      => "Laconica",
             CURLOPT_CONNECTTIMEOUT    => 120,
             CURLOPT_TIMEOUT            => 120,
             # Twitter is strict about accepting invalid "Expect" headers
             CURLOPT_HTTPHEADER => array('Expect:')
     );
 
-
     $ch = curl_init($uri);
     curl_setopt_array($ch, $options);
     $data = curl_exec($ch);
@@ -95,7 +96,7 @@ function add_twitter_user($twitter_id, $screen_name)
     $fuser->nickname = $screen_name;
     $fuser->uri = 'http://twitter.com/' . $screen_name;
     $fuser->id = $twitter_id;
-    $fuser->service = 1; // Twitter
+    $fuser->service = TWITTER_SERVICE; // Twitter
     $fuser->created = common_sql_now();
     $result = $fuser->insert();
 
@@ -206,3 +207,93 @@ function save_twitter_friends($user, $twitter_id, $screen_name, $password)
     return true;
 }
 
+function is_twitter_bound($notice, $flink) {
+
+    // Check to see if notice should go to Twitter
+    if (($flink->noticesync & FOREIGN_NOTICE_SEND)) {
+
+        // If it's not a Twitter-style reply, or if the user WANTS to send replies.
+        if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) ||
+            ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY)) {
+                return true;
+        }
+    }
+    
+    return false;
+}
+
+function broadcast_twitter($notice)
+{
+    global $config;
+    $success = true;
+
+    $flink = Foreign_link::getByUserID($notice->profile_id, 
+        TWITTER_SERVICE);
+            
+    // XXX: Not sure WHERE to check whether a notice should go to 
+    // Twitter. Should we even put in the queue if it shouldn't? --Zach
+    if (is_twitter_bound($notice, $flink)) {
+
+        $fuser = $flink->getForeignUser();
+        $twitter_user = $fuser->nickname;
+        $twitter_password = $flink->credentials;
+        $uri = 'http://www.twitter.com/statuses/update.json';
+
+        // XXX: Hack to get around PHP cURL's use of @ being a a meta character
+        $statustxt = preg_replace('/^@/', ' @', $notice->content);
+
+        $options = array(
+            CURLOPT_USERPWD        => "$twitter_user:$twitter_password",
+            CURLOPT_POST           => true,
+            CURLOPT_POSTFIELDS     => 
+                array(
+                        'status' => $statustxt,
+                        'source' => $config['integration']['source']
+                     ),
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_FAILONERROR    => true,
+            CURLOPT_HEADER         => false,
+            CURLOPT_FOLLOWLOCATION => true,
+            CURLOPT_USERAGENT      => "Laconica",
+            CURLOPT_CONNECTTIMEOUT => 120,  // XXX: How long should this be?
+            CURLOPT_TIMEOUT        => 120,
+
+            # Twitter is strict about accepting invalid "Expect" headers
+            CURLOPT_HTTPHEADER => array('Expect:')
+            );
+
+        $ch = curl_init($uri);
+        curl_setopt_array($ch, $options);
+        $data = curl_exec($ch);
+        $errmsg = curl_error($ch);
+
+        if ($errmsg) {
+            common_debug("cURL error: $errmsg - " .
+                "trying to send notice for $twitter_user.",
+                         __FILE__);
+            $success = false;
+        }
+
+        curl_close($ch);
+
+        if (!$data) {
+            common_debug("No data returned by Twitter's " .
+                "API trying to send update for $twitter_user",
+                         __FILE__);
+            $success = false;
+        }
+
+        // Twitter should return a status
+        $status = json_decode($data);
+
+        if (!$status->id) {
+            common_debug("Unexpected data returned by Twitter " .
+                " API trying to send update for $twitter_user",
+                         __FILE__);
+            $success = false;
+        }
+    }
+    
+    return $success;
+}
+
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index da8b8b1e5..74f265cbb 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -43,7 +43,7 @@ class TwitterapiAction extends Action
 
         $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
 
-        $twitter_user['profile_image_url'] = ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE);
+        $twitter_user['profile_image_url'] = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE);
         $twitter_user['protected'] = 'false'; # not supported by Laconica yet
         $twitter_user['url'] = ($profile->homepage) ? $profile->homepage : null;
 
@@ -60,20 +60,34 @@ class TwitterapiAction extends Action
 
     function twitter_status_array($notice, $include_user=true)
     {
-
         $profile = $notice->getProfile();
 
         $twitter_status = array();
         $twitter_status['text'] = $notice->content;
         $twitter_status['truncated'] = 'false'; # Not possible on Laconica
         $twitter_status['created_at'] = $this->date_twitter($notice->created);
-        $twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ? intval($notice->reply_to) : null;
+        $twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ?
+            intval($notice->reply_to) : null;
         $twitter_status['source'] = $this->source_link($notice->source);
         $twitter_status['id'] = intval($notice->id);
-        $twitter_status['in_reply_to_user_id'] = ($notice->reply_to) ? $this->replier_by_reply(intval($notice->reply_to)) : null;
+
+        $replier_profile = null;
+
+        if ($notice->reply_to) {
+            $reply = Notice::staticGet(intval($notice->reply_to));
+            if ($reply) {
+                $replier_profile = $reply->getProfile();
+            }
+        }
+
+        $twitter_status['in_reply_to_user_id'] =
+            ($replier_profile) ? intval($replier_profile->id) : null;
+        $twitter_status['in_reply_to_screen_name'] =
+            ($replier_profile) ? $replier_profile->nickname : null;
 
         if (isset($this->auth_user)) {
-            $twitter_status['favorited'] = ($this->auth_user->hasFave($notice)) ? 'true' : 'false';
+            $twitter_status['favorited'] = 
+                ($this->auth_user->hasFave($notice)) ? 'true' : 'false';
         } else {
             $twitter_status['favorited'] = 'false';
         }
@@ -137,7 +151,6 @@ class TwitterapiAction extends Action
 
     function twitter_dmsg_array($message)
     {
-
         $twitter_dm = array();
 
         $from_profile = $message->getFrom();
@@ -386,23 +399,7 @@ class TwitterapiAction extends Action
         $t = strtotime($dt);
         return date("D M d G:i:s O Y", $t);
     }
-
-    function replier_by_reply($reply_id)
-    {
-        $notice = Notice::staticGet($reply_id);
-        if ($notice) {
-            $profile = $notice->getProfile();
-            if ($profile) {
-                return intval($profile->id);
-            } else {
-                common_debug('Can\'t find a profile for notice: ' . $notice->id, __FILE__);
-            }
-        } else {
-            common_debug("Can't get notice: $reply_id", __FILE__);
-        }
-        return null;
-    }
-
+    
     // XXX: Candidate for a general utility method somewhere?
     function count_subscriptions($profile)
     {
diff --git a/lib/util.php b/lib/util.php
index 419e21e82..9637dc506 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -81,7 +81,7 @@ function common_language()
 
     // If there is a user logged in and they've set a language preference
     // then return that one...
-    if (common_logged_in()) {
+    if (_have_config() && common_logged_in()) {
         $user = common_current_user();
         $user_language = $user->language;
         if ($user_language)
@@ -315,6 +315,10 @@ function common_current_user()
 {
     global $_cur;
 
+    if (!_have_config()) {
+        return null;
+    }
+
     if ($_cur === false) {
 
         if (isset($_REQUEST[session_name()]) || (isset($_SESSION['userid']) && $_SESSION['userid'])) {
@@ -370,8 +374,6 @@ function common_canonical_email($email)
     return $email;
 }
 
-define('URL_REGEX', '^|[ \t\r\n])((ftp|http|https|gopher|mailto|news|nntp|telnet|wais|file|prospero|aim|webcal):(([A-Za-z0-9$_.+!*(),;/?:@&~=-])|%[A-Fa-f0-9]{2}){2,}(#([a-zA-Z0-9][a-zA-Z0-9$_.+!*(),;/?:@&~=%-]*))?([A-Za-z0-9$_+!*();/?:~-]))');
-
 function common_render_content($text, $notice)
 {
     $r = common_render_text($text);
@@ -388,45 +390,114 @@ function common_render_text($text)
     $r = htmlspecialchars($text);
 
     $r = preg_replace('/[\x{0}-\x{8}\x{b}-\x{c}\x{e}-\x{19}]/', '', $r);
-    $r = preg_replace_callback('@https?://[^\]>\s]+@', 'common_render_uri_thingy', $r);
-    $r = preg_replace('/(^|\s+)#([A-Za-z0-9_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r);
+    $r = common_replace_urls_callback($r, 'common_linkify');
+    $r = preg_replace('/(^|\(|\[|\s+)#([A-Za-z0-9_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r);
     // XXX: machine tags
     return $r;
 }
 
-function common_render_uri_thingy($matches)
-{
-    $uri = $matches[0];
-    $trailer = '';
+function common_replace_urls_callback($text, $callback) {
+    // Start off with a regex
+    $regex = '#'.
+    '(?:'.
+        '(?:'.
+            '(?:https?|ftps?|mms|rtsp|gopher|news|nntp|telnet|wais|file|prospero|webcal|xmpp|irc)://'.
+            '|'.
+            '(?:mailto|aim|tel):'.
+        ')'.
+        '[^.\s]+\.[^\s]+'.
+        '|'.
+        '(?:[^.\s/:]+\.)+'.
+        '(?:museum|travel|[a-z]{2,4})'.
+        '(?:[:/][^\s]*)?'.
+    ')'.
+    '#ix';
+    preg_match_all($regex, $text, $matches);
+
+    // Then clean up what the regex left behind
+    $offset = 0;
+    foreach($matches[0] as $orig_url) {
+        $url = htmlspecialchars_decode($orig_url);
+
+        // Make sure we didn't pick up an email address
+        if (preg_match('#^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$#i', $url)) continue;
+
+        // Remove surrounding punctuation
+        $url = trim($url, '.?!,;:\'"`([<');
+
+        // Remove surrounding parens and the like
+        preg_match('/[)\]>]+$/', $url, $trailing);
+        if (isset($trailing[0])) {
+            preg_match_all('/[(\[<]/', $url, $opened);
+            preg_match_all('/[)\]>]/', $url, $closed);
+            $unopened = count($closed[0]) - count($opened[0]);
+
+            // Make sure not to take off more closing parens than there are at the end
+            $unopened = ($unopened > mb_strlen($trailing[0])) ? mb_strlen($trailing[0]):$unopened;
+
+            $url = ($unopened > 0) ? mb_substr($url, 0, $unopened * -1):$url;
+        }
 
-    // Some heuristics for extracting URIs from surrounding punctuation
-    // Strip from trailing text...
-    if (preg_match('/^(.*)([,.:"\']+)$/', $uri, $matches)) {
-        $uri = $matches[1];
-        $trailer = $matches[2];
-    }
+        // Remove trailing punctuation again (in case there were some inside parens)
+        $url = rtrim($url, '.?!,;:\'"`');
+
+        // Make sure we didn't capture part of the next sentence
+        preg_match('#((?:[^.\s/]+\.)+)(museum|travel|[a-z]{2,4})#i', $url, $url_parts);
 
-    $pairs = array(
-                   ']' => '[', // technically disallowed in URIs, but used in Java docs
-                   ')' => '(', // far too frequent in Wikipedia and MSDN
-                   );
-    $final = substr($uri, -1, 1);
-    if (isset($pairs[$final])) {
-        $openers = substr_count($uri, $pairs[$final]);
-        $closers = substr_count($uri, $final);
-        if ($closers > $openers) {
-            // Assume the paren was opened outside the URI
-            $uri = substr($uri, 0, -1);
-            $trailer = $final . $trailer;
+        // Were the parts capitalized any?
+        $last_part = (mb_strtolower($url_parts[2]) !== $url_parts[2]) ? true:false;
+        $prev_part = (mb_strtolower($url_parts[1]) !== $url_parts[1]) ? true:false;
+
+        // If the first part wasn't cap'd but the last part was, we captured too much
+        if ((!$prev_part && $last_part)) {
+            $url = mb_substr($url, 0 , mb_strpos($url, '.'.$url_parts['2'], 0));
         }
+
+        // Capture the new TLD
+        preg_match('#((?:[^.\s/]+\.)+)(museum|travel|[a-z]{2,4})#i', $url, $url_parts);
+
+        $tlds = array('ac', 'ad', 'ae', 'aero', 'af', 'ag', 'ai', 'al', 'am', 'an', 'ao', 'aq', 'ar', 'arpa', 'as', 'asia', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bb', 'bd', 'be', 'bf', 'bg', 'bh', 'bi', 'biz', 'bj', 'bm', 'bn', 'bo', 'br', 'bs', 'bt', 'bv', 'bw', 'by', 'bz', 'ca', 'cat', 'cc', 'cd', 'cf', 'cg', 'ch', 'ci', 'ck', 'cl', 'cm', 'cn', 'co', 'com', 'coop', 'cr', 'cu', 'cv', 'cx', 'cy', 'cz', 'de', 'dj', 'dk', 'dm', 'do', 'dz', 'ec', 'edu', 'ee', 'eg', 'er', 'es', 'et', 'eu', 'fi', 'fj', 'fk', 'fm', 'fo', 'fr', 'ga', 'gb', 'gd', 'ge', 'gf', 'gg', 'gh', 'gi', 'gl', 'gm', 'gn', 'gov', 'gp', 'gq', 'gr', 'gs', 'gt', 'gu', 'gw', 'gy', 'hk', 'hm', 'hn', 'hr', 'ht', 'hu', 'id', 'ie', 'il', 'im', 'in', 'info', 'int', 'io', 'iq', 'ir', 'is', 'it', 'je', 'jm', 'jo', 'jobs', 'jp', 'ke', 'kg', 'kh', 'ki', 'km', 'kn', 'kp', 'kr', 'kw', 'ky', 'kz', 'la', 'lb', 'lc', 'li', 'lk', 'lr', 'ls', 'lt', 'lu', 'lv', 'ly', 'ma', 'mc', 'md', 'me', 'mg', 'mh', 'mil', 'mk', 'ml', 'mm', 'mn', 'mo', 'mobi', 'mp', 'mq', 'mr', 'ms', 'mt', 'mu', 'museum', 'mv', 'mw', 'mx', 'my', 'mz', 'na', 'name', 'nc', 'ne', 'net', 'nf', 'ng', 'ni', 'nl', 'no', 'np', 'nr', 'nu', 'nz', 'om', 'org', 'pa', 'pe', 'pf', 'pg', 'ph', 'pk', 'pl', 'pm', 'pn', 'pr', 'pro', 'ps', 'pt', 'pw', 'py', 'qa', 're', 'ro', 'rs', 'ru', 'rw', 'sa', 'sb', 'sc', 'sd', 'se', 'sg', 'sh', 'si', 'sj', 'sk', 'sl', 'sm', 'sn', 'so', 'sr', 'st', 'su', 'sv', 'sy', 'sz', 'tc', 'td', 'tel', 'tf', 'tg', 'th', 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tp', 'tr', 'travel', 'tt', 'tv', 'tw', 'tz', 'ua', 'ug', 'uk', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf', 'ws', 'ye', 'yt', 'yu', 'za', 'zm', 'zw');
+
+        if (!in_array($url_parts[2], $tlds)) continue;
+
+        // Make sure we didn't capture a hash tag
+        if (strpos($url, '#') === 0) continue;
+
+        // Put the url back the way we found it.
+        $url = (mb_strpos($orig_url, htmlspecialchars($url)) === FALSE) ? $url:htmlspecialchars($url);
+
+        // Call user specified func
+        $modified_url = $callback($url);
+
+        // Replace it!
+        $start = mb_strpos($text, $url, $offset);
+        $text = mb_substr($text, 0, $start).$modified_url.mb_substr($text, $start + mb_strlen($url), mb_strlen($text));
+        $offset = $start + mb_strlen($modified_url);
+    }
+
+    return $text;
+}
+
+function common_linkify($url) {
+    // It comes in special'd, so we unspecial it before passing to the stringifying
+    // functions
+    $ext = pathinfo($url, PATHINFO_EXTENSION);
+    $url = htmlspecialchars_decode($url);
+    $video_ext = array('mp4', 'flv', 'avi', 'mpg', 'mp3', 'ogg');
+    $display = $url;
+    $url = (!preg_match('#^([a-z]+://|(mailto|aim|tel):)#i', $url)) ? 'http://'.$url : $url;
+
+    $attrs = array('href' => $url, 'rel' => 'external');
+
+    if (in_array($ext, $video_ext)) {
+        $attrs['class'] = 'media';
     }
-    if ($longurl = common_longurl($uri)) {
-        $longurl = htmlentities($longurl, ENT_QUOTES, 'UTF-8');
-        $title = " title='$longurl'";
+
+    if ($longurl = common_longurl($url)) {
+        $attrs['title'] = $longurl;
     }
-    else $title = '';
 
-    return '<a href="' . $uri . '"' . $title . ' class="extlink">' . $uri . '</a>' . $trailer;
+    return XMLStringer::estring('a', $attrs, $display);
 }
 
 function common_longurl($short_url)
@@ -450,7 +521,7 @@ function common_shorten_links($text)
     static $cache = array();
     if (isset($cache[$text])) return $cache[$text];
     // \s = not a horizontal whitespace character (since PHP 5.2.4)
-    return $cache[$text] = preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $text);
+    return $cache[$text] = common_replace_urls_callback($text, 'common_shorten_link');;
 }
 
 function common_shorten_link($url, $reverse = false)
@@ -527,7 +598,13 @@ function common_tag_link($tag)
 {
     $canonical = common_canonical_tag($tag);
     $url = common_local_url('tag', array('tag' => $canonical));
-    return '<span class="tag"><a href="' . htmlspecialchars($url) . '" rel="tag">' . htmlspecialchars($tag) . '</a></span>';
+    $xs = new XMLStringer();
+    $xs->elementStart('span', 'tag');
+    $xs->element('a', array('href' => $url,
+                            'rel' => 'tag'),
+                 $tag);
+    $xs->elementEnd('span');
+    return $xs->getString();
 }
 
 function common_canonical_tag($tag)
@@ -545,7 +622,20 @@ function common_at_link($sender_id, $nickname)
     $sender = Profile::staticGet($sender_id);
     $recipient = common_relative_profile($sender, common_canonical_nickname($nickname));
     if ($recipient) {
-        return '<span class="vcard"><a href="'.htmlspecialchars($recipient->profileurl).'" class="url"><span class="fn nickname">'.$nickname.'</span></a></span>';
+        $user = User::staticGet('id', $recipient->id);
+        if ($user) {
+            $url = common_local_url('userbyid', array('id' => $user->id));
+        } else {
+            $url = $recipient->profileurl;
+        }
+        $xs = new XMLStringer(false);
+        $xs->elementStart('span', 'vcard');
+        $xs->elementStart('a', array('href' => $url,
+                                     'class' => 'url'));
+        $xs->element('span', 'fn nickname', $nickname);
+        $xs->elementEnd('a');
+        $xs->elementEnd('span');
+        return $xs->getString();
     } else {
         return $nickname;
     }
@@ -556,7 +646,14 @@ function common_group_link($sender_id, $nickname)
     $sender = Profile::staticGet($sender_id);
     $group = User_group::staticGet('nickname', common_canonical_nickname($nickname));
     if ($group && $sender->isMember($group)) {
-        return '<span class="vcard"><a href="'.htmlspecialchars($group->permalink()).'" class="url"><span class="fn nickname">'.$nickname.'</span></a></span>';
+        $xs = new XMLStringer();
+        $xs->elementStart('span', 'vcard');
+        $xs->elementStart('a', array('href' => $group->permalink(),
+                                     'class' => 'url'));
+        $xs->element('span', 'fn nickname', $nickname);
+        $xs->elementEnd('a');
+        $xs->elementEnd('span');
+        return $xs->getString();
     } else {
         return $nickname;
     }
@@ -573,7 +670,13 @@ function common_at_hash_link($sender_id, $tag)
         $url = common_local_url('subscriptions',
                                 array('nickname' => $user->nickname,
                                       'tag' => $tag));
-        return '<span class="tag"><a href="'.htmlspecialchars($url).'" rel="tag">'.$tag.'</a></span>';
+        $xs = new XMLStringer();
+        $xs->elementStart('span', 'tag');
+        $xs->element('a', array('href' => $url,
+                                'rel' => $tag),
+                     $tag);
+        $xs->elementEnd('span');
+        return $xs->getString();
     } else {
         return $tag;
     }
@@ -615,315 +718,20 @@ function common_relative_profile($sender, $nickname, $dt=null)
     return null;
 }
 
-// where should the avatar go for this user?
-
-function common_avatar_filename($id, $extension, $size=null, $extra=null)
+function common_local_url($action, $args=null, $params=null, $fragment=null)
 {
-    global $config;
-
-    if ($size) {
-        return $id . '-' . $size . (($extra) ? ('-' . $extra) : '') . $extension;
-    } else {
-        return $id . '-original' . (($extra) ? ('-' . $extra) : '') . $extension;
+    $r = Router::get();
+    $path = $r->build($action, $args, $params, $fragment);
+    if ($path) {
     }
-}
-
-function common_avatar_path($filename)
-{
-    global $config;
-    return INSTALLDIR . '/avatar/' . $filename;
-}
-
-function common_avatar_url($filename)
-{
-    return common_path('avatar/'.$filename);
-}
-
-function common_avatar_display_url($avatar)
-{
-    $server = common_config('avatar', 'server');
-    if ($server) {
-        return 'http://'.$server.'/'.$avatar->filename;
-    } else {
-        return $avatar->url;
-    }
-}
-
-function common_default_avatar($size)
-{
-    static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile',
-                              AVATAR_STREAM_SIZE => 'stream',
-                              AVATAR_MINI_SIZE => 'mini');
-    return theme_path('default-avatar-'.$sizenames[$size].'.png');
-}
-
-function common_local_url($action, $args=null, $fragment=null)
-{
-    $url = null;
     if (common_config('site','fancy')) {
-        $url = common_fancy_url($action, $args);
+        $url = common_path(mb_substr($path, 1));
     } else {
-        $url = common_simple_url($action, $args);
-    }
-    if (!is_null($fragment)) {
-        $url .= '#'.$fragment;
+        $url = common_path('index.php'.$path);
     }
     return $url;
 }
 
-function common_fancy_url($action, $args=null)
-{
-    switch (strtolower($action)) {
-     case 'public':
-        if ($args && isset($args['page'])) {
-            return common_path('?page=' . $args['page']);
-        } else {
-            return common_path('');
-        }
-     case 'featured':
-        if ($args && isset($args['page'])) {
-            return common_path('featured?page=' . $args['page']);
-        } else {
-            return common_path('featured');
-        }
-     case 'favorited':
-        if ($args && isset($args['page'])) {
-            return common_path('favorited?page=' . $args['page']);
-        } else {
-            return common_path('favorited');
-        }
-     case 'publicrss':
-        return common_path('rss');
-     case 'publicatom':
-        return common_path("api/statuses/public_timeline.atom");
-     case 'publicxrds':
-        return common_path('xrds');
-     case 'featuredrss':
-        return common_path('featuredrss');
-     case 'favoritedrss':
-        return common_path('favoritedrss');
-     case 'opensearch':
-        if ($args && $args['type']) {
-            return common_path('opensearch/'.$args['type']);
-        } else {
-            return common_path('opensearch/people');
-        }
-     case 'doc':
-        return common_path('doc/'.$args['title']);
-     case 'block':
-     case 'login':
-     case 'logout':
-     case 'subscribe':
-     case 'unsubscribe':
-     case 'invite':
-        return common_path('main/'.$action);
-     case 'tagother':
-        return common_path('main/tagother?id='.$args['id']);
-     case 'register':
-        if ($args && $args['code']) {
-            return common_path('main/register/'.$args['code']);
-        } else {
-            return common_path('main/register');
-        }
-     case 'remotesubscribe':
-        if ($args && $args['nickname']) {
-            return common_path('main/remote?nickname=' . $args['nickname']);
-        } else {
-            return common_path('main/remote');
-        }
-     case 'nudge':
-        return common_path($args['nickname'].'/nudge');
-     case 'openidlogin':
-        return common_path('main/openid');
-     case 'profilesettings':
-        return common_path('settings/profile');
-     case 'passwordsettings':
-        return common_path('settings/password');
-     case 'emailsettings':
-        return common_path('settings/email');
-     case 'openidsettings':
-        return common_path('settings/openid');
-     case 'smssettings':
-        return common_path('settings/sms');
-     case 'twittersettings':
-        return common_path('settings/twitter');
-     case 'othersettings':
-        return common_path('settings/other');
-     case 'deleteprofile':
-        return common_path('settings/delete');
-     case 'newnotice':
-        if ($args && $args['replyto']) {
-            return common_path('notice/new?replyto='.$args['replyto']);
-        } else {
-            return common_path('notice/new');
-        }
-     case 'shownotice':
-        return common_path('notice/'.$args['notice']);
-     case 'deletenotice':
-        if ($args && $args['notice']) {
-            return common_path('notice/delete/'.$args['notice']);
-        } else {
-            return common_path('notice/delete');
-        }
-     case 'microsummary':
-     case 'xrds':
-     case 'foaf':
-        return common_path($args['nickname'].'/'.$action);
-     case 'all':
-     case 'replies':
-     case 'inbox':
-     case 'outbox':
-        if ($args && isset($args['page'])) {
-            return common_path($args['nickname'].'/'.$action.'?page=' . $args['page']);
-        } else {
-            return common_path($args['nickname'].'/'.$action);
-        }
-     case 'subscriptions':
-     case 'subscribers':
-        $nickname = $args['nickname'];
-        unset($args['nickname']);
-        if (isset($args['tag'])) {
-            $tag = $args['tag'];
-            unset($args['tag']);
-        }
-        $params = http_build_query($args);
-        if ($params) {
-            return common_path($nickname.'/'.$action . (($tag) ? '/' . $tag : '') . '?' . $params);
-        } else {
-            return common_path($nickname.'/'.$action . (($tag) ? '/' . $tag : ''));
-        }
-     case 'allrss':
-        return common_path($args['nickname'].'/all/rss');
-     case 'repliesrss':
-        return common_path($args['nickname'].'/replies/rss');
-     case 'userrss':
-        if (isset($args['limit']))
-          return common_path($args['nickname'].'/rss?limit=' . $args['limit']);
-        return common_path($args['nickname'].'/rss');
-     case 'showstream':
-        if ($args && isset($args['page'])) {
-            return common_path($args['nickname'].'?page=' . $args['page']);
-        } else {
-            return common_path($args['nickname']);
-        }
-
-     case 'usertimeline':
-        return common_path("api/statuses/user_timeline/".$args['nickname'].".atom");
-     case 'confirmaddress':
-        return common_path('main/confirmaddress/'.$args['code']);
-     case 'userbyid':
-        return common_path('user/'.$args['id']);
-     case 'recoverpassword':
-        $path = 'main/recoverpassword';
-        if ($args['code']) {
-            $path .= '/' . $args['code'];
-        }
-        return common_path($path);
-     case 'imsettings':
-        return common_path('settings/im');
-     case 'avatarsettings':
-        return common_path('settings/avatar');
-     case 'groupsearch':
-        return common_path('search/group' . (($args) ? ('?' . http_build_query($args)) : ''));
-     case 'peoplesearch':
-        return common_path('search/people' . (($args) ? ('?' . http_build_query($args)) : ''));
-     case 'noticesearch':
-        return common_path('search/notice' . (($args) ? ('?' . http_build_query($args)) : ''));
-     case 'noticesearchrss':
-        return common_path('search/notice/rss' . (($args) ? ('?' . http_build_query($args)) : ''));
-     case 'avatarbynickname':
-        return common_path($args['nickname'].'/avatar/'.$args['size']);
-     case 'tag':
-        $path = 'tag/' . $args['tag'];
-        unset($args['tag']);
-        return common_path($path . (($args) ? ('?' . http_build_query($args)) : ''));
-     case 'publictagcloud':
-        return common_path('tags');
-     case 'peopletag':
-        $path = 'peopletag/' . $args['tag'];
-        unset($args['tag']);
-        return common_path($path . (($args) ? ('?' . http_build_query($args)) : ''));
-     case 'tags':
-        return common_path('tags' . (($args) ? ('?' . http_build_query($args)) : ''));
-     case 'favor':
-        return common_path('main/favor');
-     case 'disfavor':
-        return common_path('main/disfavor');
-     case 'showfavorites':
-        if ($args && isset($args['page'])) {
-            return common_path($args['nickname'].'/favorites?page=' . $args['page']);
-        } else {
-            return common_path($args['nickname'].'/favorites');
-        }
-     case 'favoritesrss':
-        return common_path($args['nickname'].'/favorites/rss');
-     case 'showmessage':
-        return common_path('message/' . $args['message']);
-     case 'newmessage':
-        return common_path('message/new' . (($args) ? ('?' . http_build_query($args)) : ''));
-     case 'api':
-        // XXX: do fancy URLs for all the API methods
-        switch (strtolower($args['apiaction'])) {
-         case 'statuses':
-            switch (strtolower($args['method'])) {
-             case 'user_timeline.rss':
-                return common_path('api/statuses/user_timeline/'.$args['argument'].'.rss');
-             case 'user_timeline.atom':
-                return common_path('api/statuses/user_timeline/'.$args['argument'].'.atom');
-             case 'user_timeline.json':
-                return common_path('api/statuses/user_timeline/'.$args['argument'].'.json');
-             case 'user_timeline.xml':
-                return common_path('api/statuses/user_timeline/'.$args['argument'].'.xml');
-             default: return common_simple_url($action, $args);
-            }
-         default: return common_simple_url($action, $args);
-        }
-     case 'sup':
-        if ($args && isset($args['seconds'])) {
-            return common_path('main/sup?seconds='.$args['seconds']);
-        } else {
-            return common_path('main/sup');
-        }
-     case 'newgroup':
-        return common_path('group/new');
-     case 'showgroup':
-        return common_path('group/'.$args['nickname']);
-     case 'editgroup':
-        return common_path('group/'.$args['nickname'].'/edit');
-     case 'joingroup':
-        return common_path('group/'.$args['nickname'].'/join');
-     case 'leavegroup':
-        return common_path('group/'.$args['nickname'].'/leave');
-     case 'groupbyid':
-        return common_path('group/'.$args['id'].'/id');
-     case 'grouprss':
-        return common_path('group/'.$args['nickname'].'/rss');
-     case 'groupmembers':
-        return common_path('group/'.$args['nickname'].'/members');
-     case 'grouplogo':
-        return common_path('group/'.$args['nickname'].'/logo');
-     case 'usergroups':
-        return common_path($args['nickname'].'/groups' . (($args) ? ('?' . http_build_query($args)) : ''));
-     case 'groups':
-        return common_path('group' . (($args) ? ('?' . http_build_query($args)) : ''));
-     default:
-        return common_simple_url($action, $args);
-    }
-}
-
-function common_simple_url($action, $args=null)
-{
-    global $config;
-    /* XXX: pretty URLs */
-    $extra = '';
-    if ($args) {
-        foreach ($args as $key => $value) {
-            $extra .= "&${key}=${value}";
-        }
-    }
-    return common_path("index.php?action=${action}${extra}");
-}
-
 function common_path($relative)
 {
     global $config;
@@ -1032,24 +840,6 @@ function common_redirect($url, $code=307)
 
 function common_broadcast_notice($notice, $remote=false)
 {
-
-    // Check to see if notice should go to Twitter
-    $flink = Foreign_link::getByUserID($notice->profile_id, 1); // 1 == Twitter
-    if (($flink->noticesync & FOREIGN_NOTICE_SEND) == FOREIGN_NOTICE_SEND) {
-
-        // If it's not a Twitter-style reply, or if the user WANTS to send replies...
-
-        if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) ||
-            (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY)) {
-
-            $result = common_twitter_broadcast($notice, $flink);
-
-            if (!$result) {
-                common_debug('Unable to send notice: ' . $notice->id . ' to Twitter.', __FILE__);
-            }
-        }
-    }
-
     if (common_config('queue', 'enabled')) {
         // Do it later!
         return common_enqueue_notice($notice);
@@ -1058,73 +848,11 @@ function common_broadcast_notice($notice, $remote=false)
     }
 }
 
-function common_twitter_broadcast($notice, $flink)
-{
-    global $config;
-    $success = true;
-    $fuser = $flink->getForeignUser();
-    $twitter_user = $fuser->nickname;
-    $twitter_password = $flink->credentials;
-    $uri = 'http://www.twitter.com/statuses/update.json';
-
-    // XXX: Hack to get around PHP cURL's use of @ being a a meta character
-    $statustxt = preg_replace('/^@/', ' @', $notice->content);
-
-    $options = array(
-                     CURLOPT_USERPWD         => "$twitter_user:$twitter_password",
-                     CURLOPT_POST            => true,
-                     CURLOPT_POSTFIELDS        => array(
-                                                        'status'    => $statustxt,
-                                                        'source'    => $config['integration']['source']
-                                                        ),
-                     CURLOPT_RETURNTRANSFER    => true,
-                     CURLOPT_FAILONERROR        => true,
-                     CURLOPT_HEADER            => false,
-                     CURLOPT_FOLLOWLOCATION    => true,
-                     CURLOPT_USERAGENT        => "Laconica",
-                     CURLOPT_CONNECTTIMEOUT    => 120,  // XXX: Scary!!!! How long should this be?
-                     CURLOPT_TIMEOUT            => 120,
-
-                     # Twitter is strict about accepting invalid "Expect" headers
-                     CURLOPT_HTTPHEADER => array('Expect:')
-                     );
-
-    $ch = curl_init($uri);
-    curl_setopt_array($ch, $options);
-    $data = curl_exec($ch);
-    $errmsg = curl_error($ch);
-
-    if ($errmsg) {
-        common_debug("cURL error: $errmsg - trying to send notice for $twitter_user.",
-                     __FILE__);
-        $success = false;
-    }
-
-    curl_close($ch);
-
-    if (!$data) {
-        common_debug("No data returned by Twitter's API trying to send update for $twitter_user",
-                     __FILE__);
-        $success = false;
-    }
-
-    // Twitter should return a status
-    $status = json_decode($data);
-
-    if (!$status->id) {
-        common_debug("Unexpected data returned by Twitter API trying to send update for $twitter_user",
-                     __FILE__);
-        $success = false;
-    }
-
-    return $success;
-}
-
 // Stick the notice on the queue
 
 function common_enqueue_notice($notice)
 {
-    foreach (array('jabber', 'omb', 'sms', 'public', 'ping') as $transport) {
+    foreach (array('jabber', 'omb', 'sms', 'public', 'twitter', 'facebook', 'ping') as $transport) {
         $qi = new Queue_item();
         $qi->notice_id = $notice->id;
         $qi->transport = $transport;
@@ -1140,23 +868,6 @@ function common_enqueue_notice($notice)
     return $result;
 }
 
-function common_dequeue_notice($notice)
-{
-    $qi = Queue_item::staticGet($notice->id);
-    if ($qi) {
-        $result = $qi->delete();
-        if (!$result) {
-            $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-            common_log(LOG_ERR, 'DB error deleting queue item: ' . $last_error->message);
-            return false;
-        }
-        common_log(LOG_DEBUG, 'complete dequeueing notice ID = ' . $notice->id);
-        return $result;
-    } else {
-        return false;
-    }
-}
-
 function common_real_broadcast($notice, $remote=false)
 {
     $success = true;
@@ -1188,6 +899,15 @@ function common_real_broadcast($notice, $remote=false)
             common_log(LOG_ERR, 'Error in public broadcast for notice ' . $notice->id);
         }
     }
+    if ($success) {
+        $success = broadcast_twitter($notice);
+        if (!$success) {
+            common_log(LOG_ERR, 'Error in Twitter broadcast for notice ' . $notice->id);
+        }
+    }
+
+    // XXX: Do a real-time FB broadcast here?
+
     // XXX: broadcast notices to other IM
     return $success;
 }
@@ -1406,7 +1126,7 @@ function common_negotiate_type($cprefs, $sprefs)
     }
 
     $bestq = 0;
-    $besttype = "text/html";
+    $besttype = 'text/html';
 
     foreach(array_keys($combine) as $type) {
         if($combine[$type] > $bestq) {
@@ -1415,6 +1135,9 @@ function common_negotiate_type($cprefs, $sprefs)
         }
     }
 
+    if ('text/html' === $besttype) {
+        return "text/html; charset=utf-8";
+    }
     return $besttype;
 }
 
@@ -1483,16 +1206,6 @@ function common_markup_to_html($c)
     return Markdown($c);
 }
 
-function common_profile_avatar_url($profile, $size=AVATAR_PROFILE_SIZE)
-{
-    $avatar = $profile->getAvatar($size);
-    if ($avatar) {
-        return common_avatar_display_url($avatar);
-    } else {
-        return common_default_avatar($size);
-    }
-}
-
 function common_profile_uri($profile)
 {
     if (!$profile) {
diff --git a/lib/xmlstringer.php b/lib/xmlstringer.php
new file mode 100644
index 000000000..951b13b67
--- /dev/null
+++ b/lib/xmlstringer.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Generator for in-memory XML
+ *
+ * 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  Output
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Create in-memory XML
+ *
+ * @category Output
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ * @see      Action
+ * @see      HTMLOutputter
+ */
+
+class XMLStringer extends XMLOutputter
+{
+    function __construct($indent=false)
+    {
+        $this->xw = new XMLWriter();
+        $this->xw->openMemory();
+        $this->xw->setIndent($indent);
+    }
+
+    function getString()
+    {
+        return $this->xw->outputMemory();
+    }
+
+    // utility for quickly creating XML-strings
+
+    static function estring($tag, $attrs=null, $content=null)
+    {
+        $xs = new XMLStringer();
+        $xs->element($tag, $attrs, $content);
+        return $xs->getString();
+    }
+}
\ No newline at end of file
diff --git a/locale/bg_BG/LC_MESSAGES/laconica.mo b/locale/bg_BG/LC_MESSAGES/laconica.mo
index b563ad3a8..439731dfc 100644
--- a/locale/bg_BG/LC_MESSAGES/laconica.mo
+++ b/locale/bg_BG/LC_MESSAGES/laconica.mo
diff --git a/locale/bg_BG/LC_MESSAGES/laconica.po b/locale/bg_BG/LC_MESSAGES/laconica.po
index cbdbc8ba4..15279970f 100644
--- a/locale/bg_BG/LC_MESSAGES/laconica.po
+++ b/locale/bg_BG/LC_MESSAGES/laconica.po
@@ -5,37 +5,111 @@
 # Yasen Pramatarov <yasen@lindeas.com>, 2008
 # Stoyan Zhekov <laconica@zh.otherinbox.com>, 2008
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (Laconica 0.6.4)  #-#-#-#-#\n"
 "Project-Id-Version: Laconica 0.6.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: 2008-12-12 00:00+0300\n"
-"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-01-20 13:54+0000\n"
+"Last-Translator: Stoyan Zhekov <zhesto@gmail.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../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:193
+#: ../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."
+" except this private data: password, email address, IM address, phone number."
 msgstr "о�вен тези лични данни: парола, е-поща, ме�инджър, телефон."
 
-#: ../actions/subscribe.php:84
+#: ../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 ""
+
+#: ../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."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -47,980 +121,1830 @@ msgid ""
 msgstr ""
 "%1$s вече получава бележките ви в %2$s.\n"
 "\n"
-"\t%3$s\n\nС уважение,\n%4$s.\n"
+"\t%3$s\n"
+"\n"
+"С уважение,\n"
+"%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../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 "Бележка на %1$s от %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../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"
 
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#: ../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 и при�тели"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33
+#, 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"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
-"**%%site.name%%** е у�луга за микроблогване, "
-"предо�тавена ви от [%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(Тр�бва да получите веднага електронно пи�мо � указани� за потвърждаване "
+"адре�а на е-пощата ви.)"
 
-#: ../lib/util.php:235
+#: ../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%%** е у�луга за микроблогване, предо�тавена ви от [%%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:250
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ". Изпи�ват �е пълните имена или п�евдоними на уча�тниците."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: 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/password.php:42 ../actions/register.php:178
+#: ../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:165
+#: ../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/imsettings.php:188
+#: ../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
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"�а ме�инджъра ви е изпратен код за потвърждение. За да получавате �ъобщени� "
+"от %s, тр�бва да го одобрите."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"�а адре�а на е-поща, който �те въвели, беше изпратен код за потвърждение. "
+"Проверете кути�та (или папката за �пам) за кода и указани�та за използването "
+"му."
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"�а ме�инджъра ви е изпратен код за "
-"потвърждение. За да получавате �ъобщени� от %s, тр�бва да го одобрите."
+"�а телефонни� номер, който �те въвели, беше изпратен код за потвърждение. "
+"Проверете �ъобщени�та (или папката за �пам) за кода и указани�та за "
+"използването му."
 
-#: ../lib/util.php:296
+#: ../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 "�е е открит методът в 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/twitapilaconica.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:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "Приемане"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "Добав�не на OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../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/showstream.php:254
+#: ../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:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
 #, php-format
 msgid "All updates for %s"
 msgstr "В�ички бележки за %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../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:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "Вече �те абонирани!"
 
-#: ../actions/userauthorization.php:76
+#: ../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:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "�втоматично влизане занапред. Да не �е ползва на общи компютри!"
 
-#: ../actions/avatar.php:32
+#: ../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/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "�ватарът е обновен."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"Oчаква �е потвърждение на този адре�. "
-"Проверете акаунта �и в Jabber/GTalk за �ъобщение � ин�трукции. (Добавихте ли %s в �пи�ъка �и там?)"
+"Oчаква �е потвърждение на този адре�. Проверете акаунта �и в 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 ""
+"Очаква �е потвърждение за този адре�. Проверете кути�та �и (или папката за "
+"�пам) за �ъобщение � указани�."
 
-#: ../lib/util.php:1136
+#: ../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:52
+#: ../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:93 ../actions/updateprofile.php:102
+#: ../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/updateprofile.php:118
+#: ../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 "Грешка при четене адре�а на аватара '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+#: ../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/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: 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:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Грешка при �ъздаване на потребител�ки OpenID обект"
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
 msgid "Cannot normalize that Jabber ID"
 msgstr "Грешка при нормализаци� на този Jabber ID"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr "Грешка при нормализиране адре�а на е-пощата"
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "Пром�на"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr "Пром�на обработката на пи�мата"
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "См�на на паролата"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../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:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Потвърждаване на адре�а"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "Потвърждаването е прекъ�нато."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr "Код за потвърждение"
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Кодът за потвърждение не е открит."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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/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:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "Свързване на �ъще�твуваща �метка"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Грешка при �ъздаване на OpenID форма: %s"
 
-#: ../lib/openid.php:160
+#: ../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/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow 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:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166
 msgid "Could not save avatar info"
 msgstr "Грешка при запазване данните на аватара"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159
 msgid "Could not save new profile info"
 msgstr "Грешка при запазване на нови� профил"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-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/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Грешка при �ъздаване на нов абонамент."
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: actions/confirmaddress.php:126 actions/emailsettings.php:375
+#: actions/imsettings.php:357 actions/smssettings.php:370
 msgid "Couldn't delete email confirmation."
 msgstr "Грешка при изтриване потвърждението по е-поща."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
 msgstr "Грешка при изтриване на абонамента."
 
-#: ../actions/remotesubscribe.php:125
+#: ../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."
 msgstr "�е е получен token за одобрение."
 
-#: ../actions/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: 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:175
+#: ../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/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Създаване"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "Създаване на нова �метка"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../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:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Текущ потвърден Jabber/GTalk адре�."
 
-#: ../actions/showstream.php:337
+#: ../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 "В момента"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %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/profilesettings.php:54
+#: ../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:181
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "Е-поща"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
+msgid "Email Address"
 msgstr "�дре� на е-поща"
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../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:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
 msgstr "Потвърждаване адре�а на е-поща"
 
-#: ../actions/recoverpassword.php:176
+#: ../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/userauthorization.php:136
+#: ../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 "Грешка при одобр�ване на token"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../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: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/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Грешка при вмъкване на бележка"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
 msgid "Error inserting remote profile"
 msgstr "Грешка при вмъкване на отдалечен профил"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
 msgstr "Грешка при запазване на потвърждение за адре�"
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
 msgid "Error saving remote profile"
 msgstr "Грешка при запазване на отдалечен профил"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../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:237 lib/openid.php:246
 msgid "Error saving the user."
 msgstr "Грешка при запазване на потребител."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164
 msgid "Error saving user; invalid."
 msgstr "Грешка при запазване на потребител — невалидно�т."
 
-#: ../actions/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 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: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:79
+#: ../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:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "Съще�твуващ п�евдоним"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "Въпро�и"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "�еу�пешно обнов�ване на аватара."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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:61 ../actions/repliesrss.php:80
+#: ../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/login.php:118
+#: ../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/profilesettings.php:44
+"За по-гол�ма �игурно�т, мол� въведете отново потребител�кото �и име и парола "
+"при пром�на на на�тройките."
+
+#: ../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:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "Помощ"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "�ачало"
 
-#: ../actions/profilesettings.php:49
+#: ../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:87
+#: ../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/imsettings.php:61
+#: ../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:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "IM на�тройки"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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 влезте � потребител�ко �и име и парола."
+"�ко вече имате �метка, за да � �вържете � OpenID влезте � потребител�ко �и "
+"име и парола."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"�ко и�кате да добавите OpenID към �метката "
-"�и, въведете го в кутийката отдолу и нати�нете \"Добав�не\"."
+"�ко и�кате да добавите OpenID към �метката �и, въведете го в кутийката "
+"отдолу и нати�нете \"Добав�не\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"�ко �те забравили или изгубили паролата "
-"�и, може да ви бъде изпратена нова на е-пощата, запи�ана в �метката ви."
+"�ко �те забравили или загубили паролата �и, може да получите нова на е-"
+"пощата, въведена в профила ви."
+
+#: ../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/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153
 msgid "Incorrect old password"
 msgstr "Грешна �тара парола"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
 msgid "Incorrect username or password."
 msgstr "Грешно име или парола."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"�а е-пощата, � ко�то �те реги�трирани �а "
-"изпратени ин�трукции за въз�танов�ване на паролата."
+"�а е-пощата, � ко�то �те реги�трирани �а изпратени ин�трукции за "
+"въз�танов�ване на паролата."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "�еправилен адре� на аватар '%s'"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "�еправилен адре� на е-поща: %s"
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "�еправилен адре� на домашна �траница '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "�еправилен адре� на лиценз '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
 msgid "Invalid notice content"
 msgstr "�евалидно �ъдържание на бележка"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72
 msgid "Invalid notice uri"
 msgstr "�еправилен адре� на бележка"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "�еправилен адре� на бележка"
 
-#: ../actions/updateprofile.php:86
+#: ../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: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."
 msgstr "Върнат от �ървъра неправилен адре� на профила."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "�еправилен размер."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
 msgid "Invalid username or password."
 msgstr "�еправилно име или парола."
 
-#: ../lib/util.php:237
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Ползва [Laconica](http://laconi.ca/) вер�и� %s, �и�тема "
-"за микроблогване, до�тъпна под [GNU Affero General "
-"Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Ползва [Laconica](http://laconi.ca/) вер�и� %s, �и�тема за микроблогване, "
+"до�тъпна под [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../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:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
-"Jabber или GTalk адре�, като \"UserName@example.org\". "
-"Първо �е уверете, че �те добавили %s в "
-"�пи�ъка �и � при�тели в IM или GTalk клиента �и."
+"Jabber или GTalk адре�, като \"UserName@example.org\". Първо �е уверете, че "
+"�те добавили %s в �пи�ъка �и � при�тели в IM или GTalk клиента �и."
 
-#: ../actions/profilesettings.php:55
+#: ../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:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Влизане � [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
-"Влезте � име и парола. ��мате такива? "
-"[Реги�трирайте](%%action.register%%) нова �метка или опитайте � [OpenID](%%action.openidlogin%%). "
+"Влезте � име и парола. ��мате такива? [Реги�трирайте](%%action.register%%) "
+"нова �метка или опитайте � [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Изход"
 
-#: ../actions/login.php:106
+#: ../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 "Загубена или забравена парола"
 
-#: ../actions/showstream.php:281
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php: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/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "Микроблог на %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+"Мобилен оператор за SMS. �ко знаете оператор, поддържащ SMS от е-поща, който "
+"не фигурира тук, пишете ни на адре� %s."
+
+#: ../actions/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/finishopenidlogin.php:71
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+#: actions/emailsettings.php:142 actions/smssettings.php:152
+#, fuzzy
+msgid "New"
+msgstr "�ово"
+
+#: ../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/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+#: actions/finishopenidlogin.php:99
 msgid "New nickname"
 msgstr "�ов п�евдоним"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "�ова бележка"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "�овата парола е запазена. Вл�зохте у�пешно."
 
-#: ../actions/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../actions/login.php:101 ../actions/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:99
-#: ../actions/register.php:59
+#: ../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:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
 msgstr "Този п�евдоним не е разрешен тук."
 
-#: ../actions/remotesubscribe.php:72
+#: ../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:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "П�евдоним или е-поща"
 
-#: ../actions/imsettings.php:147
+#: ../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:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "��ма за�вка за одобрение."
 
-#: ../actions/confirmaddress.php:33
+#: ../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:49
+#: ../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/userbyid.php:27
+#: ../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:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
 msgstr "��ма п�евдоним."
 
-#: ../actions/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: 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 "Сървърът не е върнал адре� на профила."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+#: actions/recoverpassword.php:266
 msgid "No registered email address for that user."
 msgstr "��ма указана е-поща за този потребител."
 
-#: ../actions/userauthorization.php:48
+#: ../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:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "��ма размер."
 
-#: ../actions/openidsettings.php:135
+#: ../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/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+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 "��ма такъв OpenID-адре�."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "��ма такъв документ."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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:56
+#: actions/recoverpassword.php:62
 msgid "No such recovery code."
 msgstr "��ма такъв код за въз�танов�ване."
 
-#: ../actions/postnotice.php:56
+#: ../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:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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 "��ма такъв потребител"
 
-#: ../lib/gallery.php:76
+#: ../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:60
+#: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr "Това не е код за въз�танов�ване."
 
-#: ../actions/imsettings.php:158
+#: ../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:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "�еправилен OpenID"
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../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:83 ../actions/register.php:61
+#: ../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:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:159
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "�еправилен адре� на профил (грешна у�луга)."
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+#: actions/remotesubscribe.php:152
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "�еправилен адре� на профил (н�ма зададен XRDS)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:143
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "�еправилен адре� на профил (н�ма YADIS документ)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
 msgstr "Файлът не е изображение или е повреден."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "Забранено."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "�еочакван отговор."
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/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/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "�е �те абонирани!"
 
-#: ../actions/showstream.php:82
+#: ../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:39
+#: actions/shownotice.php:94
 msgid "Notice has no profile"
 msgstr "Бележката н�ма профил"
 
-#: ../actions/showstream.php:297
+#: ../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/password.php:39
+#: ../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 "Стара парола"
 
-#: ../lib/util.php:288
+#: ../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: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:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
 msgstr "�втоматично предаване на OpenID"
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: 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:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Проблем � OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "�а�тройки на OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+msgstr "Може да добавите и лично �ъобщение към поканата."
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "Ча�тично качване на файла."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:335
 msgid "Password and confirmation do not match."
 msgstr "Паролата и потвърждението й не �ъвпадат."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+#: actions/recoverpassword.php:331
 msgid "Password must be 6 chars or more."
 msgstr "Паролата тр�бва да е от поне 6 знака."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
 msgid "Password recovery requested"
 msgstr "Пои�кано е въз�танов�ване на парола"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../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/password.php:61 ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../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"
+msgstr "Тър�ене на хора"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Тър�ене на хора"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "Лично"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr "Лично �ъобщение"
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Телефонен номер — � код, без пунктоаци� и без интервали."
+
+#: ../actions/userauthorization.php:78
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"Проверете тези детайли и �е уверете, че "
-"и�кате да �е абонирате за бележките на "
-"този потребител. �ко не и�кате абонамента, нати�нете \"Cancel\" (Отказ)."
+"Проверете тези детайли и �е уверете, че и�кате да �е абонирате за бележките "
+"на този потребител. �ко не и�кате абонамента, нати�нете \"Cancel\" (Отказ)."
 
-#: ../actions/imsettings.php:74
+#: ../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/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "�а�тройки"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "�а�тройките �а запазени."
 
-#: ../lib/util.php:300
+#: ../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 "Поверително�т"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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/stream.php:54
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "�дре� на профила"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
 msgstr "�а�тройки на профила"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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 "�епознат профил"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Общ поток"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Еми�и� на общи� поток"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "Общ поток"
 
-#: ../actions/recoverpassword.php:151
+#: ../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/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+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:141
+#: ../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:67
+#: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr "Код за въз�танов�ване на непознат потребител."
 
-#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: actions/register.php:69 actions/register.php:436 lib/action.php:338
+#: lib/facebookaction.php:277 lib/logingroupnav.php:78
 msgid "Register"
 msgstr "Реги�триране"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+msgid "Registration not allowed."
+msgstr "Запи�ването не е позволено."
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr "Запи�ването е у�пешно."
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "Охвърл�не"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414
 msgid "Remember me"
 msgstr "Запомни ме"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
 msgstr "Отдалечен профил без �ъответ�тващ локален"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "Отдалечен абонамент"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "Премахване на OpenID"
 
@@ -1029,50 +1953,91 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Премахването на един�твени� OpenID ще "
-"направи влизането в �и�темата невъзможно. За да го изтриете, първо добавете друг OpenID."
+"Премахването на един�твени� OpenID ще направи влизането в �и�темата "
+"невъзможно. За да го изтриете, първо добавете друг OpenID."
 
-#: ../lib/stream.php:49
+#: ../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:50
+#: ../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:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "Обнов�ване"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "�ова парола"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: 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/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../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:73 ../lib/util.php:277
+#: ../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:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "Тър�ене в еми�и�та на потока"
 
-#: ../actions/noticesearch.php:30
+#: ../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%% по "
-"�ъдържанието им. Отдел�йте фразите за "
+"Тър�ене на бележки в %%site.name%% по �ъдържанието им. Отдел�йте фразите за "
 "тър�ене (тр�бва да �а по-дълги от 3 �имвола) � интервали."
 
 #: ../actions/peoplesearch.php:28
@@ -1081,154 +2046,287 @@ 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%% по техните име, "
-"м��то или интере�и. Отдел�йте фразите за "
+"Тър�ене на хора в %%site.name%% по техните име, м��то или интере�и. "
+"Отдел�йте фразите за "
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: actions/smssettings.php:457
+msgid "Select a carrier"
+msgstr "Изберете оператор"
 
-#: ../lib/util.php:982
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
+#: lib/messageform.php:167 lib/noticeform.php:177
 msgid "Send"
 msgstr "Прати"
 
-#: ../actions/imsettings.php:71
+#: ../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."
 
-#: ../lib/util.php:282
+#: ../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:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "�а�тройките �а запазени."
 
-#: ../actions/finishaddopenid.php:66
+#: ../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 "Случи �е нещо �транно."
 
-#: ../lib/util.php:302
+#: ../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:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "Стати�тики"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../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:172
-#: ../actions/showstream.php:181
+#: ../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:294 ../actions/subscribers.php:27
+#: ../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:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "�бонаментът е одобрен"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "�бонаментът е отказан"
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/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/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
 msgid "System error uploading file."
 msgstr "Си�темна грешка при качване на файл."
 
-#: ../actions/noticesearch.php:34
+#: ../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: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:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "Този адре� е вече потвърден."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
 msgstr "Този код за потвърждение не е за ва�!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr "Тази е-поща вече �е използва от друг потребител."
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "Файлът е твърде гол�м."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr "Това вече е ваши�т Jabber ID."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr "Това и �ега е адре�ът на е-пощата ви."
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+msgstr "Това  �ега е номерът на телефона ви."
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr "Това не е ваши�т Jabber ID."
 
-#: ../actions/imsettings.php:201
+#: ../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/newnotice.php:52
+#: ../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/confirmaddress.php:86
+#: ../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
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "�дре�ът \"%s\" е потвърден за �метката ви."
 
-#: ../actions/imsettings.php:241
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413
 msgid "The address was removed."
 msgstr "�дре�ът е премахнат."
 
-#: ../actions/userauthorization.php:311
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"�бонаментът е одобрен, но не е зададен "
-"callback URL. За да завършите одобр�ването, "
-"проверете ин�трукциите на �айта. Ваши�т token за абонамент е:"
+"�бонаментът е одобрен, но не е зададен callback URL. За да завършите "
+"одобр�ването, проверете ин�трукциите на �айта. Ваши�т token за абонамент е:"
 
-#: ../actions/userauthorization.php:321
+#: ../actions/userauthorization.php:322
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"�бонаментът е отказан, но не е зададен "
-"callback URL. За да откажете напълно абонамента, проверете ин�трукциите на �айта."
+"�бонаментът е отказан, но не е зададен callback URL. За да откажете напълно "
+"абонамента, проверете ин�трукциите на �айта."
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Това �а хората, които четат бележките на %s."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Tова �а хората, които четат бележките ви."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Хора, чийто бележки %s чете."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "��ма хора, чийто бележки четете."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/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/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
 msgstr "Кодът за потвърждение е твърде �тар. Започнете проце�а отново."
 
@@ -1237,84 +2335,158 @@ 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: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 към "
-"локални� ви профил. Можете да �ъздадете нова �метка или да използвате �ъще�твуваща, ако имате такава."
+"За първи път влизате в �и�темата като %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."
 
-#: ../lib/util.php:147
+#: ../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/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+"За да �е абонирате, можете да  [влезете](%%action.login%%) или да "
+"[реги�трирате](%%action.register%%) нова �метка. �ко имате �метка на друга, "
+"[подобна у�луга за микроблогване](%%doc.openmublog%%), въведете адре�а на "
+"профила �и в не� по-долу."
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:132
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
-"За да �е абонирате, можете да  "
-"[влезете](%%action.login%%) или да "
-"[реги�трирате](%%action.register%%) нова �метка. "
-"�ко имате �метка на друга, [подобна у�луга за микроблогване](%%doc.openmublog%%), въведете адре�а на профила �и в не� по-долу."
 
-#: ../actions/profilesettings.php:51
+#: ../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:74 actions/remotesubscribe.php:83
+#: actions/remotesubscribe.php:110
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "�дре� на профила ви в друга, �ъвме�тима у�луга за микроблогване"
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/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:237
+#: ../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:245
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
-"О�вен ако не е указано друго, "
-"�ъдържанието на този �айт принадлежи на �ъздателите му и е до�тъпно под "
+"О�вен ако не е указано друго, �ъдържанието на този �айт принадлежи на "
+"�ъздателите му и е до�тъпно под "
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "�еразпознат вид адре� %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Отпи�ване"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../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/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr "Форматът на файла � изображението не �е поддържа."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr "Бележки през SMS"
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+msgstr "Бележки през ме�инджър (IM)"
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:129
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "Качване"
 
@@ -1325,108 +2497,214 @@ msgid ""
 "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."
+msgstr ""
+"Използвайте това поле, за да поканите при�тели и колеги да използват "
+"у�лугата на �айта."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Използва �е �амо за промени, об�ви или въз�танов�ване на паролата"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
 msgid "User being listened to doesn't exist."
 msgstr "Потребител�т, когото про�лед�вате, не �ъще�твува. "
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../actions/foaf.php:47 ../actions/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/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "Потребител�ки п�евдоним"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr "Потребител�т не е открит."
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr "В кой ча�ови по�� �те обикновено?"
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
 msgstr "Какво �тава, %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../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/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Грешен вид изображение за '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Грешен размер на изображението '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../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/recoverpassword.php:31
+#: ../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 "Вече �те абонирани за �ледните потребители:"
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr "С указани� потребител не �те запи�ани като при�тели."
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Тук можете да �мените паролата �и. Внимавайте колко е добра новата."
 
-#: ../actions/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Първо �е реги�трирайте, за да започнете да публикувате бележки."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Можете да премахнете OpenID от �метката �и, "
-"като нати�нете бутона \"Премахване\"."
+"Можете да премахнете OpenID от �метката �и, като нати�нете бутона "
+"\"Премахване\"."
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"Можете да получавате �ъобщени� по Jabber/GTalk "
-"[instant messages](%%doc.im%%). Въведете адре�а �и в на�тройките по-долу."
+"Можете да получавате �ъобщени� по Jabber/GTalk [instant messages](%%doc.im%"
+"%). Въведете адре�а �и в на�тройките по-долу."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"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:51
+#: ../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:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67
 msgid "You did not send us that profile"
 msgstr "�е �те ни изпратили този профил"
 
-#: ../actions/recoverpassword.php:134
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "Ваши�т OpenID URL"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr "П�евдонимът ви на този �ървър или е-пощата, � ко�то �те реги�трирани."
 
@@ -1436,841 +2714,85 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"[OpenID](%%doc.openid%%) ви позвол�ва влизане в "
-"различни �айтове � един и �ъщ акаунт. От тук �е управл�ват �ъответните OpenID."
+"[OpenID](%%doc.openid%%) ви позвол�ва влизане в различни �айтове � един и "
+"�ъщ акаунт. От тук �е управл�ват �ъответните OpenID."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "преди н�колко �екунди"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "преди около %d дни"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "преди около %d ча�а"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr "преди около %d минути"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr "преди около %d ме�еца"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "преди около ден"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "преди около минута"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "преди около ме�ец"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "преди около година"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "преди около ча�"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "отговор"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "�ъщо като паролата по-горе"
 
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "« След"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr "от"
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s ви кани да ползвате заедно %2$s"
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-"%1$s ви кани да �е при�ъедините към %2$s "
-"(%3$s).\n"
-"\n"
-"%2$s е у�луга за микроблогване, чрез ко�то "
-"ле�но поддържате връзка � хората, които "
-"познавате или които �а ви интере�ни.\n"
-"\n"
-"Също така можете да публикувате кратки "
-"новини за �ебе �и, �вои разми�ли и да ги "
-"об�ъждате в мрежата � хора, които ви "
-"познават. Това �ъщо е и добър начин за "
-"запознаване � нови хора, които �подел�т "
-"интере�ите ви.\n"
-"\n"
-"%1$s ви казва:\n\n%4$s\n\nМожете да видите профила на %1$s в %2$s тук:\n\n%5$s\n\n�ко и�кате да опитате у�лугата на �айта, про�ледете препратката по-долу, за да приемете поканата.\n\n%6$s\n\n�ко не желаете, пропу�нете това пи�мо. Благодарим ви за търпението и отделеното време.\n\nИ�крено ваши, %2$s\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr "Общ поток на %s"
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr "Съ�то�ние на %s"
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr "Поток на %s"
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-"(Тр�бва да получите веднага електронно "
-"пи�мо � указани� за потвърждаване адре�а на е-пощата ви.)"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"От 1 до 64 малки букви или цифри, без "
-"пунктоаци� и интервали. Задължително поле."
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-msgstr "6 или повече знака. Задължително поле."
-
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"�а адре�а на е-поща, който �те въвели, беше "
-"изпратен код за потвърждение. Проверете "
-"кути�та (или папката за �пам) за кода и указани�та за използването му."
-
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"�а телефонни� номер, който �те въвели, "
-"беше изпратен код за потвърждение. "
-"Проверете �ъобщени�та (или папката за �пам) за кода и указани�та за използването му."
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
-msgstr "�е е открит методът в API."
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
-msgstr "Методът в API в�е още �е разработва."
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr "Добав�не или премахване OpenID"
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr "�дре�и на при�тели, които каните (по един на ред)"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr "�аи�тина ли и�кате да изтриете тази бележка?"
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-"�втоматично абониране за в�еки, който �е "
-"абонира за мен (подход�що за ботове)."
-
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"Очаква �е потвърждение за този адре�. "
-"Проверете кути�та �и (или папката за �пам) за �ъобщение � указани�."
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr "Очаква �е потвърждение за този телефонен номер."
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr "Грешка при изтриване на бележката."
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr "Грешка при нормализиране адре�а на е-пощата"
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr "Пром�на обработката на пи�мата"
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr "См�на на паролата"
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr "Пром�на на�тройките на профила"
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr "Код за потвърждение"
-
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-"Поздравлени�, %s! И добре дошли в %%%%site.name%%%%! "
-"от тук можете да...\n"
-"\n"
-"* Отидете в [профила �и](%s) и да публикувате "
-"първата �и бележка.\n"
-"* Добавите [адре� в Jabber/GTalk](%%%%action.imsettings%%%%), "
-"за да изпращате бележки от програмата �и "
-"за моментни �ъобщени�.\n"
-"* [Тър�ите хора](%%%%action.peoplesearch%%%%), които "
-"познавате или � които �подел�те общи "
-"интере�и. \n"
-"* Обновите [на�тройките на "
-"профила(%%%%action.profilesettings%%%%) �и, за да кажете повече за �ебе �и на другите. \n* Прочетете наличната [документаци�](%%%%doc.help%%%%) на �айта, за да �е запознаете � възможно�тите му. \n\nБлагодарим, че �е включихте в �айта и дано ползването на у�лугата ви но�и �амо при�тни мигове!"
-
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Грешка при про�лед�ване на потребител: %s вече е в �пи�ъка ви."
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr "Грешка при абониране на друг потребител за ва�."
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr "Грешка при абониране."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr "�е �а открити бележки."
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr "Грешка при обнов�ване запи�а на потребител."
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Текущ потвърден телефонен номер за SMS-и."
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr "Текущ потвърден адре� на е-поща."
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr "Изтриване на бележката"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr "�дре� на е-поща"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr "�а�тройки на е-поща"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr "�дре� на е-поща, като \"UserName@example.org\""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr "�дре�и на е-поща"
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr "Въведете кода, който получихте по телефона."
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Еми�и� за етикета %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr "Тър�ене в �ъдържанието на бележките"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr "Тър�ене на хора в �айта"
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr "И�кам да изпращам бележки по пощата."
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr "IM"
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-"�ко �те забравили или загубили паролата "
-"�и, може да получите нова на е-пощата, въведена в профила ви."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr "Вход�ща поща"
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr "Вход�щи�т адре� на е-поща е премахнат."
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "�еправилен адре� на е-поща: %s"
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr "Поканите �а изпратени."
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr "Изпратени �а покани до �ледните хора:"
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr "Покани"
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr "Покани за нови потребители"
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr "Език"
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr "Името на езика е твърде дълго (може да е до 50 знака)."
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr "По-дълго име, за предпочитане \"и�тин�кото\" ви име."
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Управление на пощата, идваща от %%site.name%%."
-
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-"Мобилен оператор за SMS. �ко знаете "
-"оператор, поддържащ SMS от е-поща, който не фигурира тук, пишете ни на адре� %s."
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#, fuzzy
-msgid "New"
-msgstr "�ово"
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "�ов адре� на е-поща за публикщуване в %s"
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr "Добавен е нов вход�щ адре� на е-поща."
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr "�е"
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr "�е е избран оператор."
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr "�е е въведен код."
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr "�е е въведена е-поща."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr "��ма вход�щ адре� на е-поща."
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr "�е е въведен телефонен номер."
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr "�е е открита бележка � такъв идентификатор."
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr "�е е открита бележка � такъв идентификатор."
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr "��ма потребител � такава е-поща или потребител�ко име."
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr "Това не е реги�триран потребител."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
-msgstr "�еподдържан формат на данните"
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr "Това не е правилен адре� на е-поща."
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr "�е е открито."
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr "Тър�ене на бележки"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Бележки � етикет %s"
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr "Може да добавите и лично �ъобщение към поканата."
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr "Хора"
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr "Тър�ене на хора"
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr "Лично �ъобщение"
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Телефонен номер — � код, без пунктоаци� и без интервали."
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr "Предпочитан език"
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Публикуване на MicroID за адре�а в Jabber/GTalk."
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr "Публикуване на MicroID за адре�а на е-пощата."
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Скорошни етикети"
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr "Запи�ването не е позволено."
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr "Запи�ването е у�пешно."
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr "SMS"
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr "Телефонен номер за SMS"
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr "�а�тройки за SMS"
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr "Потвърждение за SMS"
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr "Същото като паролата по-горе. Задължително поле."
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-msgstr "Изберете оператор"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr "Изпратете пи�мо до този адре� за публикуване като бележка."
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr "Изпращане на уведомлени� за нови абонаменти по пощата."
-
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
-"Получаване на бележки в SMS. Имайте "
-"предвид, че може да има допълнителни так�и от оператора."
-
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-"Изпращане по Jabber/GTalk на отговори от хора, "
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "�ай-попул�рните етикети за изминалата �едмица"
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr "Вход�щата поща не е разрешена."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr "Това не е ваши�т вход�щ адре�."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr "Етикети"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Тек�т"
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Тази е-поща вече �е използва от друг потребител."
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr "Това и �ега е адре�ът на е-пощата ви."
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr "Това  �ега е номерът на телефона ви."
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr "Това не е ваши�т адре� на е-поща."
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr "Това не е ваши�т телефонен номер."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr "Този код за потвърждение е грешен."
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr "Този телефонен номер вече �е използва от друг потребител."
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Това е твърде дълго. Тр�бва да е най-много 255 знака."
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-msgstr "Тези хора �а потребители тук и автоматично �те абонирани за т�х:"
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
-msgstr "Този метод изи�ква за�вка POST или DELETE."
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
-msgstr "Този метод изи�ква за�вка POST."
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr "Ча�ови по��"
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr "�е е избран ча�ови по��"
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr "�епознато дей�твие"
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr "Бележки през SMS"
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr "Бележки през ме�инджър (IM)"
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Качване на нова �нимка за профила"
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-"Използвайте това поле, за да поканите "
-"при�тели и колеги да използват у�лугата на �айта."
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Потребител�т не е открит."
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr "В кой ча�ови по�� �те обикновено?"
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-msgstr "Да"
-
-#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr "Ще изтриете напълно бележката. Изтриването е невъзвратимо."
-
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr "Вече �те абонирани за �ледните потребители:"
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr "С указани� потребител не �те запи�ани като при�тели."
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr "�е може да изтривате бележки на друг потребител."
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "За да каните хора в %s, тр�бва да �те влезли."
-
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-"Ще ви уведомим при приемане на покана и "
-"запи�ване в �айта. Благодарим ви за увеличаването на общно�тта тук!"
-
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "изтриване"
-
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:555
 msgid "unsupported file type"
 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
@@ -2280,18 +2802,22 @@ msgstr "неподдържан вид файл"
 #: 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:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr "Тази бележка не е отбел�зана като любима!"
 
-#: actions/disfavor.php:63
+#: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Грешка при изтриване на любима бележка."
 
-#: actions/disfavor.php:72
+#: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
 msgstr "Любимо"
 
@@ -2299,16 +2825,18 @@ msgstr "Любимо"
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Изпращане на пи�мо при отбел�зване на мо� бележка като любима."
 
-#: actions/emailsettings.php:95
+#: 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: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
+#: classes/Command.php:132 actions/favor.php:86
+#: actions/twitapifavorites.php:125 classes/Command.php:152
 msgid "Could not create favorite."
 msgstr "Грешка при отбел�зване като любима."
 
@@ -2317,88 +2845,95 @@ msgid "Disfavor"
 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/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Еми�и� � любимите бележки на %s"
 
-#: actions/inbox.php:28
+#: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
 msgstr "Вход�ща кути� за %s — �траница %d"
 
-#: actions/inbox.php:30
+#: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 msgstr "Вход�ща кути� за %s"
 
-#: actions/inbox.php:53
+#: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "Това е вход�щата ви кути� � лични �ъобщени� от други потребители."
 
-#: actions/invite.php:178
+#: 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"
+msgstr ""
+"%1$s използва %2$s (%3$s) и ви кани да �е при�ъедините.\n"
+"\n"
 
-#: actions/login.php:104
+#: 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:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: 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:65 actions/newmessage.php:128
 msgid "No recipient specified."
 msgstr "�е е указан получател."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: 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
+#: 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."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
-"�е може да изпращате �ъобщени� до �ебе �и. "
-"По-добре �и го кажете на �ебе �и тихичко."
+"�е може да изпращате �ъобщени� до �ебе �и. По-добре �и го кажете на �ебе �и "
+"тихичко."
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
 msgid "No such user"
 msgstr "��ма такъв потребител"
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "New message"
 msgstr "�ово �ъобщение"
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
 msgstr "Бележка без �ъответ�тващ профил"
 
-#: actions/openidsettings.php:28
+#: 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/openidsettings.php:46
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
@@ -2406,64 +2941,67 @@ msgstr ""
 msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr "�ко премахнете един�твени� �и OpenID, н�ма да можете да влизате!"
 
-#: actions/openidsettings.php:87
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
 msgstr "Можете да премахнете OpenID от профила �и"
 
-#: actions/outbox.php:28
+#: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr "Изход�ща кути� за %s — �траница %d"
 
-#: actions/outbox.php:30
+#: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Изход�ща кути� за %s"
 
-#: actions/outbox.php:53
+#: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Това е изход�щата ви кути� � лични �ъобщени� до други потребители. "
 
-#: actions/peoplesearch.php:28
+#: 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/profilesettings.php:27
+#: 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:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
 msgstr "Кодът ви за потвърждение е твърде �тар."
 
-#: actions/recoverpassword.php:141
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: actions/recoverpassword.php:154
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
 msgstr ""
 
-#: actions/recoverpassword.php:169
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
 msgstr "П�евдонимът ви на този �ървър."
 
-#: actions/recoverpassword.php:271
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
 msgstr "Упътване за въз�танов�ване на паролата"
 
-#: actions/recoverpassword.php:327
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
 msgstr "�овата парола е запи�ана."
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
 msgstr "Паролата тр�бва да е 6 или повече знака."
 
@@ -2472,28 +3010,28 @@ msgstr "Паролата тр�бва да е 6 или повече знака."
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
-msgstr ""
-"Поздравлени�, %s! И добре дошли в %%%%site.name%%%%. "
+msgstr "Поздравлени�, %s! И добре дошли в %%%%site.name%%%%. "
 
 #: actions/register.php:227
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: 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: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:33 actions/showmessage.php:81
 msgid "No such message."
 msgstr "��ма такова �ъобщение"
 
@@ -2501,12 +3039,12 @@ msgstr "��ма такова �ъобщение"
 msgid "Only the sender and recipient may read this message."
 msgstr "Само подател�т и получател�т могат да четат това �ъобщение."
 
-#: actions/showmessage.php:61
+#: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Съобщение до %1$s в %2$s"
 
-#: actions/showmessage.php:66
+#: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Съобщение от %1$s в %2$s"
@@ -2515,82 +3053,89 @@ msgstr "Съобщение от %1$s в %2$s"
 msgid "Send a message"
 msgstr "Изпращане на �ъобщение"
 
-#: actions/smssettings.php:312
+#: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
 msgstr "Мобилен оператор на телефона ви."
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Преки �ъобщени� до %s"
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "В�ички преки �ъобщени�, изпратени до %s"
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
 msgid "Direct Messages You've Sent"
 msgstr "Изпратени от ва� преки �ъобщени�"
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #, 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."
 msgstr ""
-"�е може да изпращате преки �ъобщени� до "
-"хора, които не �а в �пи�ъка ви � при�тели."
+"�е може да изпращате преки �ъобщени� до хора, които не �а в �пи�ъка ви � "
+"при�тели."
 
-#: actions/twitapifavorites.php:92
+#: 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: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/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 току-що отбел�за като любима бележката ви от %2$s.\n\n"
+msgstr ""
+"%1$s току-що отбел�за като любима бележката ви от %2$s.\n"
+"\n"
 
 #: actions/twittersettings.php:27
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
-"Добав�не на профила ви в Twitter за "
-"автоматично препращане на бележките ви и там."
+"Добав�не на профила ви в Twitter за автоматично препращане на бележките ви и "
+"там."
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
 msgstr "�а�тройки за Twitter"
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
 msgstr "Профил в Twitter"
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
 msgstr "Текущ проверен профил в Twitter"
 
@@ -2598,7 +3143,7 @@ msgstr "Текущ проверен профил в Twitter"
 msgid "Twitter Username"
 msgstr "Име в Twitter"
 
-#: actions/twittersettings.php:65
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgid "No spaces, please."
 msgstr "Без интервали, мол�!"
 
@@ -2606,15 +3151,15 @@ msgstr "Без интервали, мол�!"
 msgid "Twitter Password"
 msgstr "Парола за Twitter"
 
-#: actions/twittersettings.php:72
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
 msgstr "�втоматично препращане на бележките ми към Twitter"
 
-#: actions/twittersettings.php:75
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Препращане на локалните отговори � \"@\" и към Twitter"
 
-#: actions/twittersettings.php:78
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Subscribe to my Twitter friends here."
 msgstr "�бониране за при�телите ми от Twitter тук"
 
@@ -2623,10 +3168,10 @@ msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
-"Потребител�кото име може да �ъдържа �амо "
-"цифри, малки и главни букви и добна черта. Може да е най-много 15 знака."
+"Потребител�кото име може да �ъдържа �амо цифри, малки и главни букви и добна "
+"черта. Може да е най-много 15 знака."
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
 msgid "Could not verify your Twitter credentials!"
 msgstr "Грешка при �вер�ване на данните ви � Twitter"
 
@@ -2636,163 +3181,167 @@ msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr "Грешка при извличане данните на профила \"%s\" от 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 "Грешка при запи�ване на�тройките за Twitter"
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
 msgid "Twitter settings saved."
 msgstr "�а�тройките за Twitter �а запазени."
 
-#: actions/twittersettings.php:192
+#: 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: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:245 actions/twittersettings.php:461
 msgid "Twitter preferences saved."
 msgstr "�а�тройките за Twitter �а запазени."
 
-#: actions/userauthorization.php:84
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
 msgstr ""
 
-#: actions/userauthorization.php:324
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: actions/userauthorization.php:334
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
 msgid "Command results"
 msgstr "Резултат от командата"
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:204
 msgid "Command complete"
 msgstr "Командата е изпълнена"
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:215
 msgid "Command failed"
 msgstr "Грешка при изпълнение на командата"
 
-#: classes/Command.php:39
+#: classes/Command.php:39 classes/Command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "За �ъжаление тази команда в�е още не �е поддържа."
 
-#: classes/Command.php:96
+#: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
 msgstr "�бонаменти: %1$s\n"
 
-#: classes/Command.php:125 classes/Command.php:242
+#: 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:146 classes/Command.php:166
 msgid "Notice marked as fave."
 msgstr "Бележката е отбел�зана като любима."
 
-#: classes/Command.php:166
-#, php-format
-#, fuzzy
+#: classes/Command.php:166 classes/Command.php:189
+#, fuzzy, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169
+#: classes/Command.php:169 classes/Command.php:192
 #, php-format
 msgid "Fullname: %s"
 msgstr "Пълно име: %s"
 
-#: classes/Command.php:172
+#: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
 msgstr "Ме�тоположение: %s"
 
-#: classes/Command.php:175
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашна �траница: %s"
 
-#: classes/Command.php:178
+#: classes/Command.php:178 classes/Command.php:201
 #, php-format
 msgid "About: %s"
 msgstr "Отно�но: %s"
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:228
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
-"Съобщението е твърде дълго. �ай-много "
-"може да е 140 знака, а �те въвели %d."
+"Съобщението е твърде дълго. �ай-много може да е 140 знака, а �те въвели %d."
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Пр�кото �ъобщение до %s е изпратено."
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
 msgstr "Грешка при изпращане на пр�кото �ъобщение"
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:300
 msgid "Specify the name of the user to subscribe to"
 msgstr "Уточнете името на потребител�, за когото �е абонирате."
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:307
 #, php-format
 msgid "Subscribed to %s"
 msgstr "�бонирани �те за %s."
 
-#: classes/Command.php:288
+#: 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:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Отпи�ани �те от %s."
 
-#: classes/Command.php:310 classes/Command.php:330
+#: 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:313 classes/Command.php:356
 msgid "Notification off."
 msgstr "Уведомлението е изключено."
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:358
 msgid "Can't turn off notification."
 msgstr "Грешка при изключване на уведомлението."
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:379
 msgid "Notification on."
 msgstr "Уведомлението е включено."
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:381
 msgid "Can't turn on notification."
 msgstr "Грешка при включване на уведомлението."
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
 msgstr "Команди:\n"
 
-#: classes/Message.php:53
+#: classes/Message.php:53 classes/Message.php:56
 msgid "Could not insert message."
 msgstr "Грешка при вмъкване на �ъобщението."
 
-#: classes/Message.php:63
+#: classes/Message.php:63 classes/Message.php:66
 msgid "Could not update message with new URI."
 msgstr "Грешка при обнов�ване на бележката � нов URL-адре�."
 
@@ -2800,74 +3349,1681 @@ msgstr "Грешка при обнов�ване на бележката � но
 msgid "User without matching profile in system."
 msgstr "Потребител без �ъответ�тващ профил в �и�темата."
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:289
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: 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:253 lib/mail.php:512
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
-msgstr "%1$s (%2$s) ви изпрати лично �ъобщение:\n\n"
+msgstr ""
+"%1$s (%2$s) ви изпрати лично �ъобщение:\n"
+"\n"
 
-#: lib/mailbox.php:43
+#: 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:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
 msgstr "Тази форма �ама ще �е изпрати автоматично."
 
-#: lib/personal.php:65
+#: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
 msgstr "Любими"
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Любими бележки на %s"
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
 msgstr "Потребител"
 
-#: lib/personal.php:75
+#: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
 msgstr "Вход�щи"
 
-#: lib/personal.php:76
+#: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
 msgstr "Получените от ва� �ъобщени�"
 
-#: lib/personal.php:80
+#: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
 msgstr "Изход�щи"
 
-#: lib/personal.php:81
+#: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
 msgstr "Изпратените от ва� �ъобщени�"
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
 msgstr "Twitter"
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
 msgstr "�а�тройки за интеграци� � Twitter"
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgid "To"
 msgstr "До"
 
-#: scripts/maildaemon.php:45
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "Could not parse message."
 msgstr "Грешка при обработка на �ъобщението"
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s и при�тели"
+
+#: actions/avatarsettings.php:76
+#, fuzzy
+msgid "You can upload your personal avatar."
+msgstr "Можете а обновите личните �и данни тук"
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "�а�тройки за Twitter"
+
+#: 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
+#, fuzzy
+msgid "There was a problem with your session token. "
+msgstr "Имаше проблем �ъ� �е�и�та ви в �айта. Мол�, опитайте отново!"
+
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
+
+#: 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
+#, 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
+#, fuzzy
+msgid "Unknown file type"
+msgstr "неподдържан вид файл"
+
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#, fuzzy
+msgid "No profile specified."
+msgstr "�е е указан получател."
+
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "�е е открита бележка � такъв идентификатор."
+
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "��ма такъв потребител"
+
+#: actions/block.php:129
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "�аи�тина ли и�кате да изтриете тази бележка?"
+
+#: actions/block.php:162
+#, fuzzy
+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
+#, fuzzy
+msgid "You are about to permanently delete a notice. "
+msgstr "Ще изтриете напълно бележката. Изтриването е невъзвратимо."
+
+#: actions/disfavor.php:94
+#, fuzzy
+msgid "Add to favorites"
+msgstr "Еми�и� � любимите бележки на %s"
+
+#: actions/editgroup.php:54
+#, 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"
+msgstr ""
+
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#, fuzzy
+msgid "You must be logged in to create a group."
+msgstr "За да каните хора в %s, тр�бва да �те влезли."
+
+#: 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
+#, fuzzy
+msgid "You must be an admin to edit the group"
+msgstr "За да каните хора в %s, тр�бва да �те влезли."
+
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
+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/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Грешка при обнов�ване на потребител�."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "�а�тройките �а запазени."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Очаква �е потвърждение за този телефонен номер."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#, fuzzy
+msgid "Make a new email address for posting to; "
+msgstr "�ов адре� на е-поща за публикщуване в %s"
+
+#: actions/emailsettings.php:157
+#, fuzzy
+msgid "Send me email when someone "
+msgstr "Изпращане на пи�мо при ново лично �ъобщение."
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+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!"
+msgstr ""
+
+#: actions/facebookhome.php:196
+#, php-format
+msgid "If you would like the %s app to automatically update "
+msgstr ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, 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"
+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/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:72
+#, fuzzy
+msgid "Invitations have been sent to the following users:"
+msgstr "Изпратени �а покани до �ледните хора:"
+
+#: actions/facebookinvite.php:96
+#, fuzzy, php-format
+msgid "You have been invited to %s"
+msgstr "\"Побутване\" от %s"
+
+#: 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:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
+msgstr ""
+
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Грешка при премахване на профила от Twitter"
+
+#: actions/facebooksettings.php:65
+#, fuzzy
+msgid "There was a problem saving your sync preferences!"
+msgstr "Имаше проблем �ъ� �е�и�та ви в �айта. Мол�, опитайте отново!"
+
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "�а�тройките �а запазени."
+
+#: actions/facebooksettings.php:90
+#, fuzzy
+msgid "Automatically update my Facebook status with my notices."
+msgstr "�втоматично препращане на бележките ми към Twitter"
+
+#: actions/facebooksettings.php:97
+#, fuzzy
+msgid "Send \"@\" replies to Facebook."
+msgstr "Препращане на локалните отговори � \"@\" и към Twitter"
+
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Профил"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
+msgstr ""
+
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "�а�тройки"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor favorite"
+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
+#, fuzzy
+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 ""
+
+#: 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/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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "�ватарът е обновен."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "�еу�пешно обнов�ване на аватара."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+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. "
+msgstr "Тър�ене на хора в %%site.name%% по име, ме�тоположение или интере�и."
+
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "Тър�ене на хора"
+
+#: actions/imsettings.php:70
+#, fuzzy
+msgid "You can send and receive notices through "
+msgstr "�е може да изпращате �ъобщени� до този потребител."
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+#, fuzzy
+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
+#, fuzzy
+msgid "You must be logged in to join a group."
+msgstr "За да каните хора в %s, тр�бва да �те влезли."
+
+#: actions/joingroup.php:95
+#, 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 "Грешка при про�лед�ване — потребител�т не е намерен."
+
+#: actions/joingroup.php:135
+#, fuzzy, 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
+#, fuzzy
+msgid "You must be logged in to leave a group."
+msgstr "За да каните хора в %s, тр�бва да �те влезли."
+
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "��ма такова �ъобщение"
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "�е �те ни изпратили този профил"
+
+#: actions/leavegroup.php:100
+#, fuzzy
+msgid "You may not leave a group while you are its administrator."
+msgstr "�е може да изтривате бележки на друг потребител."
+
+#: actions/leavegroup.php:130
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "Грешка при обнов�ване запи�а на потребител."
+
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "Could not create group."
+msgstr "Грешка при отбел�зване като любима."
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Грешка при �ъздаване на нов абонамент."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "Файлът е твърде гол�м."
+
+#: actions/newmessage.php:134
+#, fuzzy
+msgid "Don't send a message to yourself; "
+msgstr "�е може да изпращате �ъобщени� до този потребител."
+
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "Бележки"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
+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/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "Влизане � OpenID"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Премахване на OpenID"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "�а�тройки за Twitter"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "Тър�ене"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Името на езика е твърде дълго (може да е до 50 знака)."
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "См�на на паролата"
+
+#: actions/passwordsettings.php:89
+#, 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 ""
+
+#: actions/peopletag.php:91
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+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"
+msgstr ""
+
+#: actions/profilesettings.php:144
+#, fuzzy
+msgid "Automatically subscribe to whoever "
+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
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "Грешка при изтегл�не на любимите бележки"
+
+#: actions/public.php:220
+#, 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 "Еми�и� на общи� поток"
+
+#: actions/publictagcloud.php:63
+#, 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
+#, fuzzy
+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
+#, 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 "�дре� на личната ви �траница, блог или профил в друг �айт"
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Опишете �ебе �и и интере�ите �и в до 140 букви"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "Къде �е намирате (град, община, държава и т.н.)"
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+msgstr "о�вен тези лични данни: парола, е-поща, ме�инджър, телефон."
+
+#: actions/register.php:471
+#, fuzzy, 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
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Отговори на %s"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s favorite notices, page %d"
+msgstr "%s любими бележки"
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+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"
+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"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Еми�и� � бележки на %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, 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 ""
+
+#: actions/showgroup.php:370
+msgid "All members"
+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 "
+msgstr ""
+
+#: actions/showmessage.php:98
+#, fuzzy
+msgid "Only the sender and recipient "
+msgstr "Само подател�т и получател�т могат да четат това �ъобщение."
+
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid "%s, page %d"
+msgstr "Вход�ща кути� за %s — �траница %d"
+
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Профил"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "Потребител�т н�ма профил."
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+#, fuzzy
+msgid "User actions"
+msgstr "�епознато дей�твие"
+
+#: actions/showstream.php:342
+#, fuzzy
+msgid "Send a direct message to this user"
+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"
+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 "
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "Mobile carrier"
+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 "�бонати"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %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
+#, 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."
+
+#: 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
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+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
+#, fuzzy, php-format
+msgid "Tag %s"
+msgstr "Етикети"
+
+#: actions/tagother.php:141
+#, fuzzy
+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
+#, fuzzy
+msgid "There was a problem with your session token."
+msgstr "Имаше проблем �ъ� �е�и�та ви в �айта. Мол�, опитайте отново!"
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+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."
+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."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "�е е открито."
+
+#: actions/twittersettings.php:71
+#, fuzzy
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+"Добав�не на профила ви в Twitter за автоматично препращане на бележките ви и "
+"там."
+
+#: actions/twittersettings.php:119
+#, fuzzy
+msgid "Twitter user name"
+msgstr "Име в Twitter"
+
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Парола за Twitter"
+
+#: actions/twittersettings.php:228
+#, fuzzy
+msgid "Twitter Friends"
+msgstr "�а�тройки за Twitter"
+
+#: 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 "Грешка при извличане данните на профила \"%s\" от Twitter."
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Грешка при запазване на потребител."
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Сървърът не е върнал адре� на профила."
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "�е е открита бележка � такъв идентификатор."
+
+#: actions/unsubscribe.php:71
+#, 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 ""
+
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Проблем при запи�ване на бележката."
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "�еу�пешно обнов�ване на аватара."
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr ""
+
+#: lib/action.php:130
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "Отно�но"
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "См�на на паролата"
+
+#: 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"
+msgstr ""
+
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Създаване на нова �метка"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "��ма такъв OpenID-адре�."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Помощ"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "�ова бележка"
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "�ова бележка"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "�бонаменти"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+#, fuzzy
+msgid "All "
+msgstr "В�ички"
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "��ма такъв потребител"
+
+#: lib/blockform.php:153
+msgid "Block"
+msgstr "Блокиране"
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "%s любими бележки"
+
+#: 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 "%s любими бележки"
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+#, fuzzy
+msgid "Filter tags"
+msgstr "Еми�и� за етикета %s"
+
+#: lib/galleryaction.php:131
+#, fuzzy
+msgid "All"
+msgstr "В�ички"
+
+#: lib/galleryaction.php:137
+#, fuzzy
+msgid "Tag"
+msgstr "Етикет"
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "�дре� на личната ви �траница, блог или профил в друг �айт"
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "�бонаменти"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Опишете �ебе �и и интере�ите �и в до 140 букви"
+
+#: lib/groupeditform.php:158
+#, 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"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Изход"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+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
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Страницата не е до�тъпна във вида меди�, който приемате"
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Вход"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Запазване"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Влезте � името и паролата �и."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Създаване на нова �метка"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s вече получава бележките ви в %2$s."
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Ме�тоположение: %s"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Домашна �траница: %s"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, fuzzy, 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) ви изпрати лично �ъобщение:\n"
+"\n"
+
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr ""
+"%1$s току-що отбел�за като любима бележката ви от %2$s.\n"
+"\n"
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+#, fuzzy
+msgid "From"
+msgstr "от"
+
+#: lib/messageform.php:110
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Изтриване на бележката"
+
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "Изпращане на �ъобщение"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 или повече знака"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "в отговор на..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Грешка при изтриване на бележката."
+
+#: lib/noticelist.php:451
+#, 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
+#, fuzzy
+msgid "Nudge this user"
+msgstr "\"Побутването\" е изпратено!"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Nudge"
+msgstr "\"Побутването\" е изпратено!"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "�е може да изпращате �ъобщени� до този потребител."
+
+#: lib/personaltagcloudsection.php:56
+#, fuzzy, php-format
+msgid "Tags in %s's notices"
+msgstr "Потребител�т н�ма по�ледна бележка"
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr ""
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Общ поток"
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#, fuzzy
+msgid "Recent tags"
+msgstr "Скорошни етикети"
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr "Избрано"
+
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "Попул�рно"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Бележки"
+
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "Тър�ене на хора в �айта"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Отдалечен абонамент"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "�бонирани �те за %s."
+
+#: lib/subgroupnav.php:97
+#, 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"
+msgstr ""
+"Използвайте това поле, за да поканите при�тели и колеги да използват "
+"у�лугата на �айта."
+
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Потребител�т н�ма профил."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "�бонирани �те за %s."
+
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+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
+#, fuzzy
+msgid "Unblock"
+msgstr "Разрешаване"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+#, fuzzy
+msgid "Unsubscribe from this user"
+msgstr "Отпи�ани �те от %s."
+
+#, fuzzy
+#~ msgid "Code not yet ready."
+#~ msgstr "Командата в�е още не �е поддържа."
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "Създаване на нова �метка"
+
+#, fuzzy
+#~ msgid "Delete my account confirmation"
+#~ msgstr "Грешка при изтриване потвърждението по е-поща."
+
+#, fuzzy
+#~ msgid "Check if you are sure you want to delete your account."
+#~ msgstr "�аи�тина ли и�кате да изтриете тази бележка?"
+
+#, fuzzy
+#~ msgid "Showing recently popular notices"
+#~ msgstr "Тър�ене в �ъдържанието на бележките"
+
+#~ msgid "List"
+#~ msgstr "Спи�ък"
+
+#~ msgid "Icons"
+#~ 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"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "�е може да �е потвърди електронната поща."
+
+#~ msgid "Email address"
+#~ msgstr "�дре� на е-поща"
+
+#~ msgid "Error inserting notice"
+#~ 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 ""
+#~ "�ко �те забравили или изгубили паролата �и, може да ви бъде изпратена "
+#~ "нова на е-пощата, запи�ана в �метката ви."
diff --git a/locale/ca_ES/LC_MESSAGES/laconica.mo b/locale/ca_ES/LC_MESSAGES/laconica.mo
index 4710aa6c5..e1b9084eb 100644
--- a/locale/ca_ES/LC_MESSAGES/laconica.mo
+++ b/locale/ca_ES/LC_MESSAGES/laconica.mo
diff --git a/locale/ca_ES/LC_MESSAGES/laconica.po b/locale/ca_ES/LC_MESSAGES/laconica.po
index 7de9466c6..9052deef1 100644
--- a/locale/ca_ES/LC_MESSAGES/laconica.po
+++ b/locale/ca_ES/LC_MESSAGES/laconica.po
@@ -6,46 +6,86 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Oscar Ciutat <oscarciutat@gmail.com>\n"
-"Language-Team: Catalan <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../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:193
+#: ../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."
+" 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/subscribe.php:84
+#: ../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 ""
+
+#: ../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/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 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."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -62,126 +102,285 @@ msgstr ""
 "Atentament,\n"
 "%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../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 "estat de %1$s a %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../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 ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
 #, php-format
 msgid "%s Public Stream"
 msgstr "Flux públic de %s"
 
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#: ../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 i amics"
 
-#: ../lib/util.php:233
+#: ../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
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
 #, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
-"**%%site.name%%** és un servei de microblogging de "
-"[%%site.broughtby%%**](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:235
+#: ../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%%** és un servei de microblogging de [%%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%%** és un servei de microblogging."
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 ". Els col·laboradors han de ser citats pel seu nom complet o sobrenom. "
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: 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 lletres en minúscula o números, sense signes de puntuació o "
-"espais"
+"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
 msgstr "6 o més caràcters"
 
-#: ../actions/recoverpassword.php:165
+#: ../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/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"S'ha enviat un codi de confirmació a l'adreça de missatgeria instantània que "
+"has afegit. Has d'acceptar que %s et pugui enviar missatges."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55 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 ""
-"S'ha enviat un codi de confirmació a l'adreça de missatgeria instantània "
-"que has afegit. Has d'acceptar que %s et pugui enviar missatges."
 
-#: ../lib/util.php:296
+#: ../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 ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
 msgstr "Sobre"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "Acceptar"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "Afegir OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92
 msgid "Address"
 msgstr "Adreça"
 
-#: ../actions/showstream.php:254
+#: ../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 "Totes les subscripcions"
 
-#: ../actions/publicrss.php:62
+#: ../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/noticesearchrss.php:66
+#: ../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/finishopenidlogin.php:29 ../actions/login.php:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "Ja estàs subscrit!"
 
-#: ../actions/userauthorization.php:76
+#: ../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 "Autoritzar subscripció"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Iniciar sessió automàticament en el futur; no utilitzar en ordinadors "
 "compartits!"
 
-#: ../actions/avatar.php:32
+#: ../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 "Avatar"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "Avatar actualitzat."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -191,276 +390,505 @@ msgstr ""
 "Jabber/GTalk un missatge amb més instruccions. (Has afegit a %s a la teva "
 "llista d'amics?)"
 
-#: ../lib/util.php:1136
+#: ../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
+#, fuzzy
 msgid "Before »"
 msgstr "Anterior »"
 
-#: ../actions/profilesettings.php:52
+#: ../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:93 ../actions/updateprofile.php:102
+#: ../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/updateprofile.php:118
+#: ../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 "No es pot llegir l'URL de l'avatar '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+#: ../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/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114
 msgid "Cancel"
 msgstr "Cancel·lar"
 
-#: ../lib/openid.php:121
+#: ../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/imsettings.php:154
+#: ../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/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "Canviar"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Canviar contrasenya"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../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 "Confirmar"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Confirmar adreça"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "Confirmació cancel·lada."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Codi de confirmació no trobat. "
 
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "Connectar-se"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../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:304
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Posar-se en contacte"
 
-#: ../lib/openid.php:178
+#: ../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"
 
-#: ../lib/openid.php:160
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow 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 "No s'ha pogut redirigir al servidor: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../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:154
+#: ../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"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "No s'ha pogut confirmar el correu electrònic."
+#: ../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 "No s'han pogut convertir els senyals de petició a senyals d'accés."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "No s'ha pogut crear la subscripció."
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../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."
 
-#: ../actions/unsubscribe.php:56
+#: ../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/remotesubscribe.php:125
+#: ../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."
 msgstr "No s'ha pogut obtenir un senyal de petició."
 
-#: ../actions/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: 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/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/profilesettings.php:175
+#: ../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/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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 "No s'ha pogut actualitzar l'usuari."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Crear"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "Crear nou compte"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../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/imsettings.php:45
+#: ../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/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../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 "Actualment"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Error de BD en inserir resposta: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../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 "Explica'ns alguna cosa sobre tu i els teus interessos en 140 caràcters"
 
-#: ../actions/register.php:181
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Adreça de correu electrònic"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
+msgid "Email Address"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../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 "L'adreça de correu electrònic ja existeix."
 
-#: ../lib/mail.php:82
+#: ../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/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../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 "Escriu un sobrenom o una adreça de correu electrònic."
 
-#: ../actions/userauthorization.php:136
+#: ../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 "Error en autoritzar senyal"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../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/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+#: actions/finishaddopenid.php:126
 msgid "Error connecting user."
 msgstr "Error en connectar usuari."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
 msgid "Error inserting avatar"
 msgstr "Error en inserir 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/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Error en inserir avís"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
 msgid "Error inserting remote profile"
 msgstr "Error en inserir perfil remot"
 
-#: ../actions/recoverpassword.php:201
+#: ../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/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
 msgid "Error saving remote profile"
 msgstr "Error en guardar perfil remot"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving the profile."
 msgstr "Error en guardar perfil."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
 msgid "Error saving the user."
 msgstr "Error en guardar l'usuari."
 
-#: ../actions/password.php:80
+#: ../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/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 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/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
 msgid "Error updating profile"
 msgstr "Error en actualitzar el perfil"
 
 #: ../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/recoverpassword.php:79
+#: ../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/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "Sobrenom ja existent."
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "Preguntes freqüents"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "Error en actualitzar avatar."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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:61 ../actions/repliesrss.php:80
+#: ../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/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, 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
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -468,39 +896,68 @@ msgstr ""
 "Per raons de seguretat, si us plau torna a escriure el teu nom d'usuari i "
 "contrasenya abans de canviar la teva configuració."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/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:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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)."
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "Inici"
 
-#: ../actions/profilesettings.php:49
+#: ../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/profilesettings.php:87
+#: ../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/imsettings.php:61
+#: ../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 "Adreça de missatgeria instantània"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "Configuració de missatgeria instantània"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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."
@@ -516,24 +973,34 @@ msgstr ""
 "Si vols afegir un compte OpenID, introdueix-lo en el camp de sota i clica "
 "\"Afegir\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"Si has oblidat o has perdut la teva contrasenya, pots rebre una de nova a "
-"l'adreça de correu electrònic que vas utilitzar per a registrar el teu "
-"compte."
 
-#: ../actions/password.php:69
+#: ../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 "Contrasenya antiga incorrecta"
 
-#: ../actions/login.php:63
+#: ../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/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -541,71 +1008,107 @@ msgstr ""
 "S'han enviat instruccions per a recuperar la teva contrasenya a l'adreça de "
 "correu electrònic registrada."
 
-#: ../actions/updateprofile.php:113
+#: ../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/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../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/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "L'URL de la llicència '%s' és invàlid"
 
-#: ../actions/postnotice.php:61
+#: ../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/postnotice.php:67
+#: ../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/postnotice.php:72
+#: ../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/updateprofile.php:86
+#: ../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/remotesubscribe.php:96
+#: ../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/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/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Mida invàlida."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: 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."
 
-#: ../lib/util.php:237
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Utilitza el software de microblogging [Laconica](http://laconi.ca), versió "
-"%s, disponible sota la [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Utilitza el software de microblogging [Laconica](http://laconi.ca), versió %"
+"s, disponible sota la [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../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/imsettings.php:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -615,339 +1118,625 @@ msgstr ""
 "assegura't d'afegir a %s a la teva llista d'amics en el teu client de "
 "missatgeria instantània o a GTalk."
 
-#: ../actions/profilesettings.php:55
+#: ../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 ""
+
+#: ../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/profilesettings.php:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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/login.php:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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 "Inici de sessió"
 
-#: ../actions/openidlogin.php:44
+#: ../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/login.php:122
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
 "Inicia una sessió amb el teu nom d'usuari i la teva contrasenya. Encara no "
 "tens un nom d'usuari? [Crea](%%action.register%%) un nou compte o prova "
 "[OpenID] (%%action.openidlogin%%)."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Sortir"
 
-#: ../actions/login.php:106
+#: ../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 "Contrasenya oblidada o perduda?"
 
-#: ../actions/showstream.php:281
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php: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 "Membre des de"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog de %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: 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 "
 
-#: ../actions/finishopenidlogin.php:71
+#: ../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 ""
+
+#: ../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 "Nou sobrenom"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "Nou avís"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
 
-#: ../actions/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../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/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59
+#: ../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/finishopenidlogin.php:165 ../actions/profilesettings.php:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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 ""
 "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: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: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"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "Sobrenom o correu electrònic"
 
-#: ../actions/imsettings.php:147
+#: ../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 "Cap Jabber ID."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "Cap petició d'autorització!"
 
-#: ../actions/confirmaddress.php:33
+#: ../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 "Cap codi de confirmació."
 
-#: ../actions/newnotice.php:49
+#: ../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/userbyid.php:27
+#: ../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 "Cap identificador."
 
+#: ../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 "Cap sobrenom retornat pel servidor remot."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
 msgstr "Cap sobrenom."
 
-#: ../actions/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: 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/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 "Cap URL de perfil retornar pel servidor."
 
-#: ../actions/recoverpassword.php:189
+#: ../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/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
 msgid "No request found!"
 msgstr "Cap petició trobada!"
 
 #: ../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/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "Cap mida."
 
-#: ../actions/openidsettings.php:135
+#: ../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/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+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 "No existeix aquest compte OpenID."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "No existeix aquest document."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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/recoverpassword.php:56
+#: ../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/postnotice.php:56
+#: ../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:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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."
 
-#: ../lib/gallery.php:76
+#: ../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 "Ningú a mostrar!"
 
-#: ../actions/recoverpassword.php:60
+#: ../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/imsettings.php:158
+#: ../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 no vàlid"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "OpenID no vàlid."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../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 "Adreça de correu electrònic no vàlida."
 
-#: ../actions/profilesettings.php:83 ../actions/register.php:61
+#: ../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/remotesubscribe.php:118
+#: ../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/remotesubscribe.php:111
+#: ../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/remotesubscribe.php:104
+#: ../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/avatar.php:95
+#: ../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/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "No autoritzat."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "Resposta inesperada!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/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 "No connectat."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "No estàs subscrit!"
 
-#: ../actions/showstream.php:82
+#: ../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 "Feed d'avisos de %s"
 
-#: ../actions/shownotice.php:39
+#: ../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:297
+#: ../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/password.php:39
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "Antiga contrasenya"
 
-#: ../lib/util.php:288
+#: ../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: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: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/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:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Error OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "Configuració OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "Càrrega parcial."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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/recoverpassword.php:249
+#: ../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/recoverpassword.php:245
+#: ../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/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../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/password.php:89 ../actions/recoverpassword.php:274
+#: ../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/password.php:61 ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../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"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Cerca de gent"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "Personal"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/userauthorization.php:78
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
@@ -957,91 +1746,156 @@ msgstr ""
 "subscriure't als avisos d'aquest usuari. Si no has demanat subscriure't als "
 "avisos de ningú, clica \"Cancel·lar\"."
 
-#: ../actions/imsettings.php:74
+#: ../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/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "Preferències guardades."
 
-#: ../lib/util.php:300
+#: ../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 "Privacitat"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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."
 
-#: ../lib/stream.php:54
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "URL del perfil"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
 msgstr "Configuració del perfil"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Públic"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Feed del flux públic"
 
-#: ../actions/public.php:33
+#: ../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/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr "Recuperar"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198
 msgid "Recover password"
 msgstr "Recuperar contrasenya"
 
-#: ../actions/recoverpassword.php:67
+#: ../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/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: 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/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "Rebutjar"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../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/updateprofile.php:69
+#: ../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/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "Subscripció remota"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: 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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "Eliminar OpenID"
 
@@ -1053,40 +1907,82 @@ msgstr ""
 "Si elimines el teu únic OpenID no podràs tornar a entrar! Si necessites "
 "eliminar-lo, afegeix un altre abans."
 
-#: ../lib/stream.php:49
+#: ../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:50
+#: ../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 "Respostes a %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "Restablir"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "Restablir contrasenya"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+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/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../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 "Guardar"
 
-#: ../lib/searchaction.php:73 ../lib/util.php:277
+#: ../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/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "Feed del flux de cerca"
 
-#: ../actions/noticesearch.php:30
+#: ../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 "
@@ -1101,117 +1997,244 @@ msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Troba gent a %%site.name%% per nom, ubicació o interessos. Separa els "
-"termes de cerca amb espais; han de ser majors a 3 caràcters."
+"Troba gent a %%site.name%% per nom, ubicació o interessos. Separa els termes "
+"de cerca amb espais; han de ser majors a 3 caràcters."
 
-#: ../lib/util.php:982
+#: ../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 "Enviar"
 
-#: ../actions/imsettings.php:71
+#: ../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 "Enviar-me avisos per Jabber/GTalk."
 
-#: ../lib/util.php:282
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr "Configuració"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "Configuració guardada."
 
-#: ../actions/finishaddopenid.php:66
+#: ../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 "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."
 
-#: ../lib/util.php:302
+#: ../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 "Font"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "Estadístiques"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../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:172
-#: ../actions/showstream.php:181
+#: ../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:294 ../actions/subscribers.php:27
+#: ../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:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "Subscripció autoritzada"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "Subscripció rebutjada"
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../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/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/noticesearch.php:34
+#: ../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 "Cerca de text"
 
-#: ../actions/openidsettings.php:140
+#: ../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:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "Aquesta adreça ja ha estat confirmada."
 
-#: ../actions/confirmaddress.php:43
+#: ../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/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "Aquest fitxer és massa gran."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr "Aquest ja és el teu Jabber ID."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr "Aquest no és el teu Jabber ID."
 
-#: ../actions/imsettings.php:201
+#: ../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 "Aquesta adreça de missatgeria instantània és incorrecta."
 
-#: ../actions/newnotice.php:52
+#: ../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 "Massa llarg. La longitud màxima és de 140 caràcters."
 
-#: ../actions/confirmaddress.php:86
+#: ../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/confirmaddress.php:92 actions/confirmaddress.php:92
 #, 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/imsettings.php:241
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: 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/userauthorization.php:311
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
@@ -1221,35 +2244,39 @@ msgstr ""
 "Llegeix de nou les instruccions per a saber com autoritzar la subscripció. "
 "El teu identificador de subscripció és:"
 
-#: ../actions/userauthorization.php:321
+#: ../actions/userauthorization.php:322
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"S'ha rebutjat la subscripció, però no s'ha enviat un URL de retorn. "
-"Llegeix de nou les instruccions per a saber com rebutjar la subscripció "
-"completament."
+"S'ha rebutjat la subscripció, però no s'ha enviat un URL de retorn. Llegeix "
+"de nou les instruccions per a saber com rebutjar la subscripció completament."
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, 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."
 
-#: ../actions/subscribers.php:33
+#: ../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/subscriptions.php:35
+#: ../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/subscriptions.php:33
+#: ../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/recoverpassword.php:87
+#: ../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/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."
 
@@ -1258,58 +2285,105 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Aquest formulari s'hauria d'enviar automàticament. En cas contrari, clica "
-"el botó d'enviament per a anar al teu proveïdor d'OpenID."
+"Aquest formulari s'hauria d'enviar automàticament. En cas contrari, clica el "
+"botó d'enviament per a anar al teu proveïdor d'OpenID."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../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 ""
-"Aquesta és la primera vegada que accedeixes a %s. Per tant, hem de "
-"connectar el teu OpenID a un compte local. Pots crear-ne un de nou o "
-"connectar-te amb el teu, si el tens."
+"Aquesta és la primera vegada que accedeixes a %s. Per tant, hem de connectar "
+"el teu OpenID a un compte local. Pots crear-ne un de nou o connectar-te amb "
+"el teu, si el tens."
 
-#: ../lib/util.php:147
+#: ../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 "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis."
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 "Per a subscriure't, pots [iniciar una sessió](%%action.login%%), o "
 "[registrar](%%action.register%%) un nou compte. Si ja tens un en un [servei "
 "de microblogging compatible](%%doc.openmublog%%), escriu l'URL del teu "
 "perfil a sota."
 
-#: ../actions/profilesettings.php:51
+#: ../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 del teu web, blog o perfil en un altre lloc"
 
-#: ../actions/remotesubscribe.php:74
+#: ../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/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../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/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323
 msgid "Unexpected password reset."
 msgstr "Restabliment de contrasenya inesperat."
 
+#: ../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 "Versió desconeguda del protocol OMB."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1317,24 +2391,52 @@ msgstr ""
 "Tret que s'especifiqui el contrari, el contingut d'aquest web és propietat "
 "dels seus col·laboradors i està disponible sota la"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Tipus d'adreça %s desconeguda"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Cancel·lar subscripció"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../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/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr "Format d'imatge no suportat."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "Pujar"
 
@@ -1346,109 +2448,210 @@ msgid ""
 "share."
 msgstr ""
 "Puja un nou \"avatar\" (imatge d'usuari) aquí. No pots editar la imatge una "
-"vegada carregada, per tant assegura't que sigui més o menys quadrada. A "
-"més, ha d'estar sota la llicència del lloc web. Utilitza una foto que "
-"sigui teva i que vulguis compartir."
+"vegada carregada, per tant assegura't que sigui més o menys quadrada. A més, "
+"ha d'estar sota la llicència del lloc web. Utilitza una foto que sigui teva "
+"i que vulguis compartir."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../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 ""
-"Utilitzat només per a actualitzacions, anuncis i recuperació de "
-"contrasenyes"
+"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenyes"
 
 #: ../actions/finishremotesubscribe.php:86
+#: 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:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../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:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "Sobrenom de l'usuari"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
 msgstr "Què tal, %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../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\""
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipus d'imatge incorrecte per a '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Mida d'imatge incorrecta per a '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../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 "Ja tens aquest OpenID!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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 "Ja t'has connectat!"
 
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Pots canviar la teva contrasenya aquí. Tria una de bona!"
 
-#: ../actions/register.php:164
+#: ../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/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/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/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"Pots enviar i rebre avisos via [missatges instantanis](%%doc.im%%) de "
-"Jabber/GTalk. Configura la teva adreça i opcions a sota."
+"Pots enviar i rebre avisos via [missatges instantanis](%%doc.im%%) de Jabber/"
+"GTalk. Configura la teva adreça i opcions a sota."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 "Pots actualitzar la informació del teu perfil personal per a que la gent "
 "sàpiga més sobre tu."
 
 #: ../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/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../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/updateprofile.php:62
+#: ../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/recoverpassword.php:134
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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 "T'has identificat. Escriu una nova contrasenya a continuació."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "El teu URL OpenID"
 
-#: ../actions/recoverpassword.php:149
+#: ../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 "
@@ -1463,1369 +2666,2207 @@ msgstr ""
 "[OpenID](%%doc.openid%%) et permet accedir a molts llocs amb un mateix "
 "compte d'usuari. Administra els teus OpenID associats aquí."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "fa pocs segons"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "fa %d dies"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "fa %d hores"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fa %d minuts"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr "fa %d mesos"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "fa un dia"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "fa un minut"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "fa un mes"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "fa un any"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "fa una hora"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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 "en resposta a..."
 
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "resposta"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "repeteix la contrasenya anterior"
 
-#: ../lib/util.php:1127
+#: ../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 "« Següent"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
+#: 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/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: 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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
+msgid "%s favorite notices"
 msgstr ""
 
-#: ../actions/invite.php:168 actions/invite.php:176
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
+msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+#: 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:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
+#: actions/login.php:122 actions/login.php:264
+msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
+#: actions/login.php:126 actions/login.php:268
+msgid "Login with your username and password. "
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
+#: 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/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
+#: 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/register.php:213
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+msgid "No such user"
 msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
+#: actions/newmessage.php:117 actions/newmessage.php:67
+msgid "New message"
 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/noticesearch.php:95 actions/noticesearch.php:146
+msgid "Notice without matching profile"
 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/openidsettings.php:28 actions/openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+#: actions/outbox.php:53 actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+"Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
+msgid "You can update your personal profile info here "
 msgstr ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
+#: 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/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+msgid "This confirmation code is too old. "
 msgstr ""
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
 msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
 msgstr ""
 
-#: ../actions/register.php:202
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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...\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."
+"want to..."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: 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 "Could not follow user: %s is already on your list."
+msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
 msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
+#: actions/showstream.php:154
+msgid "Send a message"
 msgstr ""
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, php-format
+msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#, php-format
+msgid "Direct messages to %s"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
+msgid "No message text!"
 msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
+#: 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/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
-msgid "Feed for tag %s"
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
+#: 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 ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
+#: 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 ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+msgid "Twitter settings"
 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/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+msgid "Current verified Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
 msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
 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/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
+msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+msgid "Twitter settings saved."
 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/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
+msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
+#: 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/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+msgid "Twitter preferences saved."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
+msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
+msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+msgid "Command results"
 msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
+#: classes/Command.php:96 classes/Command.php:113
+#, php-format
+msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
+msgid "User has no last notice"
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
+#: classes/Command.php:146 classes/Command.php:166
+msgid "Notice marked as fave."
 msgstr ""
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
-msgid "Notices tagged with %s"
+msgid "Homepage: %s"
 msgstr ""
 
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
 msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
+#: classes/Command.php:295 classes/Command.php:335
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: 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:28 actions/register.php:28
-msgid "Registration not allowed."
+#: classes/Command.php:313 classes/Command.php:356
+msgid "Notification off."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
+#: classes/Message.php:53 classes/Message.php:56
+msgid "Could not insert message."
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
+#: classes/Message.php:63 classes/Message.php:66
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
 msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: lib/mail.php:253 lib/mail.php:512
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: lib/mailbox.php:43 lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: lib/openid.php:195 lib/openid.php:203
+msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+msgid "Favorites"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
 msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
 msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
+msgid "Twitter"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
+msgid "Twitter integration options"
 msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+msgid "Could not parse message."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s i amics"
+
+#: actions/avatarsettings.php:76
+msgid "You can upload your personal avatar."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Configuració"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "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 ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
 msgstr ""
 
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
+#: actions/avatarsettings.php:334 actions/grouplogo.php:391
+#: classes/User_group.php:112
+#, fuzzy
+msgid "Lost our file."
+msgstr "No existeix aquest aví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"
 msgstr ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "No existeix aquest usuari."
+
+#: actions/block.php:129
+msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/block.php:162
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Ja t'has connectat!"
+
+#: 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 "L'adreça ha estat eliminada."
+
+#: actions/deletenotice.php:73
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
 #, php-format
-msgid "Updates from %1$s on %2$s!"
+msgid "Edit %s group"
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: 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/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: actions/editgroup.php:87 actions/grouplogo.php:87
+#: actions/groupmembers.php:76 actions/joingroup.php:81
+#: actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "Cap sobrenom."
+
+#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
+#: actions/groupmembers.php:83 actions/joingroup.php:88
+#: actions/showgroup.php:128
+#, fuzzy
+msgid "No such group"
+msgstr "No existeix aquest avís."
+
+#: 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:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
 msgstr ""
+"El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
+"espais."
 
-#: ../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/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "La biografia és massa llarga (màx. 140 caràcters)."
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "No s'ha pogut actualitzar l'usuari."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "Configuració guardada."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Error amb el codi de confirmació."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/emailsettings.php:321
+#, fuzzy
+msgid "That email address already belongs "
+msgstr "L'adreça de correu electrònic ja existeix."
+
+#: actions/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
+msgstr ""
+"S'ha enviat un codi de confirmació a l'adreça de missatgeria instantània que "
+"has afegit. Has d'acceptar que %s et pugui enviar missatges."
+
+#: actions/facebookhome.php:110
+msgid "Server error - couldn't get user!"
+msgstr ""
+
+#: actions/facebookhome.php:196
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "If you would like the %s app to automatically update "
 msgstr ""
 
-#: ../lib/mail.php:147
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, 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 "Allow %s to update my Facebook status"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: actions/facebookhome.php:218
+msgid "Skip"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
+#: actions/facebookhome.php:235
+#, fuzzy
+msgid "No notice content!"
+msgstr "Cap contingut!"
+
+#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+msgid "Pagination"
+msgstr ""
+
+#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#, fuzzy
+msgid "After"
+msgstr "« Següent"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#, fuzzy
+msgid "Before"
+msgstr "Anterior »"
+
+#: actions/facebookinvite.php:70
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "Feed per a amics de %s"
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
 msgstr ""
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "No s'ha pogut actualitzar l'usuari."
+
+#: actions/facebooksettings.php:65
+msgid "There was a problem saving your sync preferences!"
 msgstr ""
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Preferències guardades."
+
+#: actions/facebooksettings.php:90
+msgid "Automatically update my Facebook status with my notices."
 msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Favor"
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Perfil"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
 msgstr ""
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Preferències"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+#, fuzzy
+msgid "Popular notices"
+msgstr "No existeix aquest avís."
+
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "No existeix aquest avís."
+
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/featured.php:71
 #, php-format
-msgid "%s favorite notices"
+msgid "Featured users, page %d"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/featured.php:99
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/inbox.php:28
-#, php-format
-msgid "Inbox for %s - page %d"
+#: actions/finishremotesubscribe.php:188
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/inbox.php:30
-#, php-format
-msgid "Inbox for %s"
+#: actions/groupbyid.php:79
+msgid "No ID"
 msgstr ""
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+msgid "Group logo"
 msgstr ""
 
-#: actions/invite.php:178
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Avatar actualitzat."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Error en actualitzar avatar."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: actions/login.php:126
-msgid "Login with your username and password. "
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
 msgstr ""
 
-#: actions/newmessage.php:65
-msgid "No recipient specified."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
+#: actions/groups.php:90
+#, php-format
+msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#, fuzzy
+msgid "Create a new group"
+msgstr "Crear nou compte"
+
+#: actions/groupsearch.php:57
+#, fuzzy, php-format
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
+"Troba gent a %%site.name%% per nom, ubicació o interessos. Separa els termes "
+"de cerca amb espais; han de ser majors a 3 caràcters."
 
-#: actions/newmessage.php:108
-msgid "No such user"
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "Cerca de gent"
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
 msgstr ""
 
-#: actions/newmessage.php:117
-msgid "New message"
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
 msgstr ""
 
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
+#: actions/imsettings.php:147
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk "
+msgstr "Enviar-me avisos per Jabber/GTalk."
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Cap codi de confirmació."
+
+#: actions/joingroup.php:65
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/openidsettings.php:28
+#: actions/joingroup.php:95
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Ja t'has connectat!"
+
+#: actions/joingroup.php:128
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "No s'ha pogut redirigir al servidor: %s"
+
+#: actions/joingroup.php:135
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgid "%s joined group %s"
 msgstr ""
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/leavegroup.php:65
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "No existeix aquest avís."
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "No ens vas enviar aquest perfil"
+
+#: actions/leavegroup.php:100
+msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/outbox.php:28
-#, php-format
-msgid "Outbox for %s - page %d"
+#: actions/leavegroup.php:130
+msgid "Could not find membership record."
 msgstr ""
 
-#: actions/outbox.php:30
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "No s'ha pogut crear el formulari OpenID: %s"
+
+#: actions/leavegroup.php:145
 #, php-format
-msgid "Outbox for %s"
+msgid "%s left group %s"
 msgstr ""
 
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
 msgstr ""
 
-#: actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
+#: actions/newgroup.php:177
+#, fuzzy
+msgid "Could not create group."
+msgstr "No s'ha pogut guardar la informació de l'avatar"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "No s'ha pogut crear la subscripció."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "Aquest fitxer és massa gran."
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "Avisos"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
 msgstr ""
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
+#: actions/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "Accés OpenID"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Eliminar OpenID"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Configuració"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
 msgstr ""
 
-#: actions/register.php:216
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "Cercar"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Canviar contrasenya"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "Contrasenya guardada."
+
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Adreça de correu electrònic no vàlida."
+
+#: actions/peopletag.php:47
 #, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:91
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "Perfil desconegut"
+
+#: actions/profilesettings.php:124
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/profilesettings.php:144
+msgid "Automatically subscribe to whoever "
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: actions/profilesettings.php:229 actions/tagother.php:176
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "La pàgina personal '%s' és invàlida"
+
+#: actions/profilesettings.php:311
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "No s'ha pogut guardar el perfil."
+
+#: actions/public.php:107
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Línia temporal pública"
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/public.php:220
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
 
-#: actions/showfavorites.php:61
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Feed del flux públic"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Feed for favorites of %s"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/showmessage.php:33
-msgid "No such message."
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/register.php:149
+#, fuzzy
+msgid "You can't register if you don't "
+msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
+
+#: actions/register.php:286
+msgid "With this form you can create "
 msgstr ""
 
-#: actions/showmessage.php:61
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: actions/register.php:368
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, "
+msgstr ""
+"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
+
+#: actions/register.php:382 actions/register.php:386
+#, fuzzy
+msgid "Used only for updates, announcements, "
+msgstr ""
+"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenyes"
+
+#: actions/register.php:398
+#, fuzzy
+msgid "URL of your homepage, blog, "
+msgstr "URL del teu web, blog o perfil en un altre lloc"
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Explica'ns alguna cosa sobre tu i els teus interessos en 140 caràcters"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
 msgstr ""
+"excepte les següents dades privades: contrasenya, adreça de correu "
+"electrònic, adreça de missatgeria instantània, número de telèfon."
 
-#: actions/showmessage.php:66
+#: actions/register.php:471
 #, php-format
-msgid "Message from %1$s on %2$s"
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/register.php:495
+msgid "(You should receive a message by email "
 msgstr ""
 
-#: actions/smssettings.php:312
+#: 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 "Respostes a %s"
+
+#: actions/showfavorites.php:79
 #, php-format
-msgid "Mobile carrier for your phone. "
+msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
-msgid "Direct messages to %s"
+msgid "%s group"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/showgroup.php:79
 #, php-format
-msgid "All the direct messages sent to %s"
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
+#: actions/showgroup.php:206
+#, fuzzy
+msgid "Group profile"
+msgstr "No existeix aquest avís."
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#, fuzzy
+msgid "Note"
+msgstr "Avisos"
+
+#: actions/showgroup.php:270
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Feed d'avisos de %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
+msgid "Members"
+msgstr "Membre des de"
+
+#: 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/showgroup.php:370
+msgid "All members"
+msgstr ""
+
+#: actions/showgroup.php:378
 #, php-format
-msgid "All the direct messages sent from %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Perfil"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "L'usuari no té perfil."
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Subscriptors"
+
+#: actions/showstream.php:533
+msgid "All groups"
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/showstream.php:542
 #, php-format
-msgid "%s / Favorites from %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+
+#: actions/smssettings.php:128
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, "
+msgstr ""
+"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
+
+#: actions/smssettings.php:162
+#, fuzzy
+msgid "Send me notices through SMS; "
+msgstr "Enviar-me avisos per Jabber/GTalk."
+
+#: actions/smssettings.php:335
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. "
+msgstr "Aquest codi de confirmació no és per a tu!"
+
+#: actions/smssettings.php:453
+msgid "Mobile carrier"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/subedit.php:70
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "No ens vas enviar aquest perfil"
+
+#: actions/subedit.php:83
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "No s'ha pogut crear la subscripció."
+
+#: actions/subscribe.php:55
+#, fuzzy
+msgid "Not a local user."
+msgstr "No existeix aquest usuari."
+
+#: actions/subscribe.php:69
+#, fuzzy
+msgid "Subscribed"
+msgstr "Subscriure's"
+
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Subscriptors"
+
+#: actions/subscribers.php:52
 #, php-format
-msgid "%s updates favorited by %s / %s."
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/subscribers.php:63
+#, fuzzy
+msgid "These are the people who listen to "
+msgstr "Aquestes són les persones que escolten els avisos de %s."
+
+#: actions/subscribers.php:67
+#, fuzzy, php-format
+msgid "These are the people who "
+msgstr "Aquestes són les persones que escolten els avisos de %s."
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Totes les subscripcions"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Totes les subscripcions"
+
+#: actions/subscriptions.php:65
+#, fuzzy
+msgid "These are the people whose notices "
+msgstr "Aquestes són les persones que %s escolta."
+
+#: actions/subscriptions.php:69
+#, fuzzy, php-format
+msgid "These are the people whose "
+msgstr "Aquestes són les persones que escolten els avisos de %s."
+
+#: actions/subscriptions.php:122
+#, fuzzy
+msgid "Jabber"
+msgstr "Cap Jabber ID."
+
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Microblog de %s"
+
+#: actions/tag.php:66
 #, php-format
-msgid "%s added your notice as a favorite"
+msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/tagother.php:33
+#, fuzzy
+msgid "Not logged in"
+msgstr "No connectat."
+
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No id argument."
+msgstr "No existeix aquest document."
+
+#: actions/tagother.php:65
 #, php-format
+msgid "Tag %s"
+msgstr ""
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr ""
+
+#: actions/tagother.php:149
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/tagother.php:164
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/tagother.php:191
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
+#: actions/tagother.php:198
+#, fuzzy
+msgid "Could not save tags."
+msgstr "No s'ha pogut guardar la informació de l'avatar"
+
+#: actions/tagother.php:233
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "No existeix aquest avís."
+
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Microblog de %s"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
 msgstr ""
 
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "Cap petició trobada!"
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Nova contrasenya"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
 msgstr ""
 
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
 msgstr ""
 
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
+#: actions/twittersettings.php:341
+#, fuzzy, php-format
+msgid "Unable to retrieve account information "
+msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Error en guardar l'usuari."
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Cap URL de perfil retornar pel servidor."
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Perfil remot sense perfil corresponent"
+
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Cancel·lar subscripció"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
 msgstr ""
 
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Problema en guardar l'avís."
+
+#: classes/Notice.php:109
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Error en actualitzar avatar."
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr ""
+
+#: lib/action.php:130
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgid "%s - %s"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
+#: lib/action.php:145
+msgid "Untitled page"
 msgstr ""
 
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
+#: lib/action.php:316
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
+#: lib/action.php:325
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "Sobre"
+
+#: lib/action.php:328
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
+#: lib/action.php:332
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
+#: lib/action.php:335
+msgid "Login to the site"
 msgstr ""
 
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Crear nou compte"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "No existeix aquest compte OpenID."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Ajuda"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "Nou avís"
+
+#: lib/action.php:417
+msgid "Local views"
 msgstr ""
 
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "Nou avís"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Subscripcions"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
 msgstr ""
 
-#: classes/Channel.php:113
-msgid "Command results"
+#: lib/action.php:630
+msgid "All "
 msgstr ""
 
-#: classes/Channel.php:148
-msgid "Command complete"
+#: lib/action.php:635
+msgid "license."
 msgstr ""
 
-#: classes/Channel.php:158
-msgid "Command failed"
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "No existeix aquest usuari."
+
+#: lib/blockform.php:153
+msgid "Block"
 msgstr ""
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
 msgstr ""
 
-#: classes/Command.php:96
+#: lib/facebookaction.php:268
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
+#: lib/facebookaction.php:271
+#, fuzzy
+msgid " a new account."
+msgstr "Crear nou compte"
+
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#, fuzzy
+msgid "Published"
+msgstr "Públic"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
+msgid "Favor this notice"
+msgstr "No existeix aquest avís."
+
+#: lib/feedlist.php:64
+msgid "Export data"
 msgstr ""
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
+#: lib/galleryaction.php:121
+msgid "Filter tags"
 msgstr ""
 
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
+#: lib/galleryaction.php:131
+msgid "All"
 msgstr ""
 
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
+#: lib/galleryaction.php:137
+msgid "Tag"
 msgstr ""
 
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
+#: lib/galleryaction.php:139
+msgid "Go"
 msgstr ""
 
-#: classes/Command.php:178
-#, php-format
-msgid "About: %s"
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "URL del teu web, blog o perfil en un altre lloc"
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Subscripcions"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Explica'ns alguna cosa sobre tu i els teus interessos en 140 caràcters"
+
+#: lib/groupeditform.php:158
+#, fuzzy
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
 msgstr ""
 
-#: classes/Command.php:200
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Edit %s group properties"
 msgstr ""
 
-#: classes/Command.php:214
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Sortir"
+
+#: lib/groupnav.php:107
 #, php-format
-msgid "Direct message to %s sent"
+msgid "Add or edit %s logo"
 msgstr ""
 
-#: classes/Command.php:216
-msgid "Error sending direct message."
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
 msgstr ""
 
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
 msgstr ""
 
-#: classes/Command.php:270
+#: lib/grouptagcloudsection.php:56
 #, php-format
-msgid "Subscribed to %s"
+msgid "Tags in %s group's notices"
 msgstr ""
 
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis."
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Inici de sessió"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Guardar"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Nom d'usuari o contrasenya invàlids."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Crear nou compte"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
 msgstr ""
 
-#: classes/Command.php:295
+#: lib/mail.php:175
 #, php-format
-msgid "Unsubscribed from %s"
+msgid ""
+"Hey, %s.\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s ara està escoltant els teus avisos a %2$s."
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Ubicació"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Pàgina personal"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:313
-msgid "Notification off."
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
 msgstr ""
 
-#: classes/Command.php:315
-msgid "Can't turn off notification."
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr ""
 
-#: classes/Command.php:333
-msgid "Notification on."
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s ara està escoltant els teus avisos a %2$s."
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
 msgstr ""
 
-#: classes/Command.php:335
-msgid "Can't turn on notification."
+#: lib/messageform.php:110
+msgid "Send a direct notice"
 msgstr ""
 
-#: classes/Command.php:344
-msgid "Commands:\n"
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "Nou avís"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 o més caràcters"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "en resposta a..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
 msgstr ""
 
-#: classes/Message.php:53
-msgid "Could not insert message."
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "resposta"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+msgid "Delete this notice"
 msgstr ""
 
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
+#: lib/noticelist.php:474
+msgid "Delete"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
 msgstr ""
 
-#: lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: lib/nudgeform.php:128
+msgid "Nudge"
 msgstr ""
 
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/personaltagcloudsection.php:56
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
+#: lib/profilelist.php:182
+msgid "(none)"
 msgstr ""
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
-msgstr ""
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Públic"
 
-#: lib/personal.php:65
-msgid "Favorites"
+#: lib/publicgroupnav.php:80
+msgid "User groups"
 msgstr ""
 
-#: lib/personal.php:66
-#, php-format
-msgid "%s's favorite notices"
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
 msgstr ""
 
-#: lib/personal.php:66
-msgid "User"
+#: lib/publicgroupnav.php:86
+msgid "Featured"
 msgstr ""
 
-#: lib/personal.php:75
-msgid "Inbox"
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "Cerca de gent"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Avisos"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
 msgstr ""
 
-#: lib/personal.php:76
-msgid "Your incoming messages"
+#: lib/section.php:89
+msgid "Untitled section"
 msgstr ""
 
-#: lib/personal.php:80
-msgid "Outbox"
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Subscripció remota"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Subscripció remota"
+
+#: lib/subgroupnav.php:97
+#, php-format
+msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/personal.php:81
-msgid "Your sent messages"
+#: lib/subgroupnav.php:104
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/settingsaction.php:99
-msgid "Twitter"
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "L'usuari no té perfil."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Subscripció autoritzada"
+
+#: lib/tagcloudsection.php:56
+msgid "None"
 msgstr ""
 
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
+#: lib/topposterssection.php:74
+msgid "Top posters"
 msgstr ""
 
-#: lib/util.php:1718
-msgid "To"
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "No existeix aquest usuari."
+
+#: lib/unblockform.php:150
+msgid "Unblock"
 msgstr ""
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "Crear nou compte"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "No s'ha pogut confirmar el correu electrònic."
+
+#~ msgid "Email address"
+#~ msgstr "Adreça de correu electrònic"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Error en inserir avís"
+
+#~ 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."
diff --git a/locale/cs_CZ/LC_MESSAGES/laconica.mo b/locale/cs_CZ/LC_MESSAGES/laconica.mo
index 8957da675..0c6b4a3fa 100644
--- a/locale/cs_CZ/LC_MESSAGES/laconica.mo
+++ b/locale/cs_CZ/LC_MESSAGES/laconica.mo
diff --git a/locale/cs_CZ/LC_MESSAGES/laconica.po b/locale/cs_CZ/LC_MESSAGES/laconica.po
index 002d9c0ab..a6f5d4f89 100644
--- a/locale/cs_CZ/LC_MESSAGES/laconica.po
+++ b/locale/cs_CZ/LC_MESSAGES/laconica.po
@@ -6,50 +6,88 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#, php-format
-#, fuzzy
+#: actions/noticesearchrss.php:88
+#, fuzzy, php-format
 msgid " Search Stream for \"%s\""
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Hledej ve Streamu \"%s\"\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../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/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 ""
+
+#: ../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/invite.php:170
+#, php-format
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+"%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 ""
-"až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní "
-"�íslo."
 
-#: ../actions/subscribe.php:84
+#: ../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/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -63,946 +101,1711 @@ msgstr ""
 "\n"
 "\t%3\n"
 "\n"
-"S úctou váš,\n%4$s.\n"
+"S úctou váš,\n"
+"%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../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 "%1 statusů na %2"
 
-#: ../actions/publicrss.php:60
+#: ../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 ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
 #, php-format
 msgid "%s Public Stream"
 msgstr "Veřejný \"Stream\""
 
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#: ../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 a přátelé"
 
-#: ../lib/util.php:233
+#: ../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
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** je služba microblogů, kterou pro vás poskytuje "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:235
+#: ../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ů."
 
-#: ../lib/util.php:250
+#: ../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/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: 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/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
 msgstr "6 a více znaků"
 
-#: ../actions/recoverpassword.php:165
+#: ../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/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"Ověřující kód byl poslán na vloženou IM adresu. Musíte prokázat %s pro "
+"posílání zpráv."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"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/util.php:296
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
 msgstr "O nás"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "Přijmout"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "Přidej OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92
 msgid "Address"
 msgstr "Adresa"
 
-#: ../actions/showstream.php:254
+#: ../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 "Všechny odběry"
 
-#: ../actions/publicrss.php:62
+#: ../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/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Všechny položky obsahující \"%s\""
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "Již přihlášeno"
 
-#: ../actions/userauthorization.php:76
+#: ../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 "Autorizovaný odběr"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Příště automaticky přihlásit; ne pro po�íta�e, které používá "
 
-#: ../actions/avatar.php:32
+#: ../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 "Obrázek"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "Obrázek nahrán"
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"Č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ů?)"
+"Čakám na potvrzení této adresy. Zkontrolujte zprávy na vašem Jabber/GTalk "
+"ú�tu. (Přidal jste si %s do vašich kontaktů?)"
 
-#: ../lib/util.php:1136
+#: ../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
+#, fuzzy
 msgid "Before »"
 msgstr "Starší »"
 
-#: ../actions/profilesettings.php:52
+#: ../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/profilesettings.php:93 ../actions/updateprofile.php:102
+#: ../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 "Text je příliš dlouhý (maximální délka je 140 zanků)"
 
-#: ../actions/updateprofile.php:118
+#: ../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 "Nelze pře�íst adresu obrázku '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+#: ../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/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../lib/openid.php:121
+#: ../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/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
 msgid "Cannot normalize that Jabber ID"
 msgstr "Nelze normalizovat JabberID"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "Změnit"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../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 "Heslo znovu"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Potvr� adresu"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "Potvr� zrušení"
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+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/finishopenidlogin.php:91
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "Připojit"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "Zruš existující ú�et"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Nelze vytvořit OpenID z: %s"
 
-#: ../lib/openid.php:160
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow 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 "Nelze přesměrovat na server: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../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/updateprofile.php:154
+#: ../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/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Nelze potvrdit email"
+#: ../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 "Nelze konvertovat řetězec požadavku na přístupový řetězec."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Nelze vytvořit odebírat"
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: 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/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
 msgstr "Nelze smazat odebírání"
 
-#: ../actions/remotesubscribe.php:125
+#: ../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."
 msgstr "Nelze získat řetězec požadavku."
 
-#: ../actions/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: 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/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/profilesettings.php:175
+#: ../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/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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 "Nelze aktualizovat uživatele"
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Vytvořit"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "Vytvořit nový ú�et"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../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/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Potvrzené Jabber/GTalk adresy"
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../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 "Nyní"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../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/profilesettings.php:54
+#: ../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 "Popiš sebe a své zájmy ve 140 znacích"
 
-#: ../actions/register.php:181
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "Email"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Emailová adresa"
+#: ../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/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
 msgid "Email address already exists."
 msgstr "Emailová adresa již existuje"
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
 msgstr "Potvrzení emailové adresy"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../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 "Zadej přezdívku nebo emailovou adresu"
 
-#: ../actions/userauthorization.php:136
+#: ../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 "Chyba potvrujícího řetězce"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../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/finishaddopenid.php:78
+#: ../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/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/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/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Chyba při vkládání nového sdělení"
-
 #: ../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/recoverpassword.php:201
+#: ../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/userauthorization.php:139
+#: ../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/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving the profile."
 msgstr "Chyba při ukládaní profilu"
 
-#: ../lib/openid.php:237
+#: ../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/password.php:80
+#: ../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/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 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/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
 msgid "Error updating profile"
 msgstr "Chyba při aktualizaci profilu"
 
 #: ../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/recoverpassword.php:79
+#: ../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/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "Existující jméno"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "FAQ"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "Nahrávání obrázku selhalo."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74 ../actions/allrss.php:64
-#: actions/all.php:61 actions/allrss.php:64
-#, php-format
-#, fuzzy
+#: ../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 ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Feed přítel uživatele: %s\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
-#: ../actions/replies.php:65 actions/replies.php:65 actions/repliesrss.php:66
-#, php-format
-#, fuzzy
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
+#: actions/repliesrss.php:71
+#, fuzzy, php-format
 msgid "Feed for replies to %s"
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Feed odpovědí na %s\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, 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
 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/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:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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:279
+#: ../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:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "Domů"
 
-#: ../actions/profilesettings.php:49
+#: ../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/profilesettings.php:87
+#: ../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/imsettings.php:61
+#: ../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 "IM adresa"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "IM nastavení"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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 ""
-"Pokud již máte ú�et, přihlašte se pomocí přezdívky a hesla. A poté "
-"propojte ú�et s OpenID."
+"Pokud již máte ú�et, přihlašte se pomocí přezdívky a hesla. A poté propojte "
+"ú�et s OpenID."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Pokud chcete přidat OpenID k vašemu ú�tu, zadejte OpenID do pole níže "
-"a klikněte na \"Přidat\"."
+"Pokud chcete přidat OpenID k vašemu ú�tu, zadejte OpenID do pole níže a "
+"klikněte na \"Přidat\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"Pokud jste zapomněl nebo stratil heslo, můžete si nechat zaslat nové na "
-"vaší emailovou adresu uloženou u vašeho ú�tu."
 
-#: ../actions/password.php:69
+#: ../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 "Neplatné heslo"
 
-#: ../actions/login.php:63
+#: ../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/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Návod jak obnovit heslo byl odeslát na vaší emailovou adresu "
-"zaregistrovanou u vašeho ú�tu."
+"Návod jak obnovit heslo byl odeslát na vaší emailovou adresu zaregistrovanou "
+"u vašeho ú�tu."
 
-#: ../actions/updateprofile.php:113
+#: ../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/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Neplatná adresa '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../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/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
 msgid "Invalid notice content"
 msgstr "Neplatný obsah sdělení"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72
 msgid "Invalid notice uri"
 msgstr "Neplatná uri sdělení"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "Neplatná url sdělení"
 
-#: ../actions/updateprofile.php:86
+#: ../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/remotesubscribe.php:96
+#: ../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/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/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Neplatná velikost"
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
 msgid "Invalid username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: ../lib/util.php:237
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 "Běží na [Laconica](http://laconi.ca/) mikroblogovací program, verze %s, "
-"dostupná pod [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"dostupná pod [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../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/imsettings.php:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
-"Jabber nebo GTalk adresy, například \"jmeno@neco.cz\". Neprve se ujistěte "
-"že jste přidal %s do vašeho seznamu kontaktů."
+"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:55
+#: ../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 ""
+
+#: ../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/profilesettings.php:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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/login.php:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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/openidlogin.php:44
+#: ../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/login.php:122
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
-"Přihlaste se pomocí vaší prezdívky a hesla. Zatím nejste "
-"zaregistrován? [Registrovat](%%action.register%%) nový ú�et, nebo "
-"vyzkoušejte [OpenID](%%action.openidlogin%%)."
+"Přihlaste se pomocí vaší prezdívky a hesla. Zatím nejste zaregistrován? "
+"[Registrovat](%%action.register%%) nový ú�et, nebo vyzkoušejte [OpenID](%%"
+"action.openidlogin%%)."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Odhlásit"
 
-#: ../actions/login.php:106
+#: ../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 "Ztracené nebo zapomenuté heslo?"
 
-#: ../actions/showstream.php:281
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php: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 "ÄŒlenem od"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "Mikroblog od %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: 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/finishopenidlogin.php:71
+#: ../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 ""
+
+#: ../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 "Nová přezdívka"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "Nové sdělení"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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/recoverpassword.php:275
+#: ../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/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../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/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59
+#: ../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/finishopenidlogin.php:165 ../actions/profilesettings.php:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
 msgstr "Přezdívka není povolena"
 
-#: ../actions/remotesubscribe.php:72
+#: ../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/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "Přezdívka nebo email"
 
-#: ../actions/imsettings.php:147
+#: ../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 "Žádné Jabber ID."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "Žádné potvrení!"
 
-#: ../actions/confirmaddress.php:33
+#: ../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 "Žádný potvrzující kód."
 
-#: ../actions/newnotice.php:49
+#: ../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/userbyid.php:27
+#: ../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 "Žádné 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 "Nebyla poskytnuta žádná přezdívka od servru."
 
-#: ../actions/avatarbynickname.php:27
+#: ../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/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: 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/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 "Nebylo vráceno žádné URL profilu od servu."
 
-#: ../actions/recoverpassword.php:189
+#: ../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/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
 msgid "No request found!"
 msgstr "Žádný požadavek nebyl nalezen!"
 
 #: ../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/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "Žádná velikost"
 
-#: ../actions/openidsettings.php:135
+#: ../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/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+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 "Žádné takové OpenID"
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "Žádný takový dokument."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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/recoverpassword.php:56
+#: ../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/postnotice.php:56
+#: ../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:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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 "Žádný takový uživatel."
 
-#: ../lib/gallery.php:76
+#: ../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 "Nikdo k zobrazení!"
 
-#: ../actions/recoverpassword.php:60
+#: ../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/imsettings.php:158
+#: ../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 "Není platným Jabber ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "Není platným OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../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 "Není platnou mailovou adresou."
 
-#: ../actions/profilesettings.php:83 ../actions/register.php:61
+#: ../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:118
+#: ../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:111
+#: ../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: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/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/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "Neautorizován."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "Ne�ekaná odpově�."
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/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 "Nepřihlášen"
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "Nepřihlášen!"
 
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr ""
+
 #: ../actions/showstream.php:82 actions/showstream.php:82
-#, php-format
-#, fuzzy
+#: actions/showstream.php:180 actions/showstream.php:187
+#: actions/showstream.php:192
+#, fuzzy, php-format
 msgid "Notice feed for %s"
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Feed sdělení pro %s\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:94
 msgid "Notice has no profile"
 msgstr "Sdělení nemá profil"
 
-#: ../actions/showstream.php:297
+#: ../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/password.php:39
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "Staré heslo"
 
-#: ../lib/util.php:288
+#: ../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: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: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/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:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID selhalo: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "Nastavení OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+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:98
-#: ../actions/register.php:177
+#: ../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:249
+#: ../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/recoverpassword.php:245
+#: ../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/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../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/password.php:89 ../actions/recoverpassword.php:274
+#: ../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/password.php:61 ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../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"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Hledání lidí"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "Osobní"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/userauthorization.php:78
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"Prosím zkontrolujte tyto detailu, a ujistěte se že opravdu chcete "
-"odebírat sdělení tohoto uživatele. Pokud ne, ask to subscribe to "
-"somone's notices, klikněte na \"Zrušit\""
+"Prosím zkontrolujte tyto detailu, a ujistěte se že opravdu chcete odebírat "
+"sdělení tohoto uživatele. Pokud ne, ask to subscribe to somone's notices, "
+"klikněte na \"Zrušit\""
 
-#: ../actions/imsettings.php:74
+#: ../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/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "Nastavení uloženo"
 
-#: ../lib/util.php:300
+#: ../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 "Soukromí"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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í"
 
-#: ../lib/stream.php:54
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "Adresa Profilu"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
 msgstr "Nastavené Profilu"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Veřejné"
-
-#: ../actions/public.php:54 actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 #, fuzzy
 msgid "Public Stream Feed"
 msgstr ""
@@ -1010,47 +1813,94 @@ msgstr ""
 "Veřejný Stream Feed\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/public.php:33
+#: ../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/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr "Obnovit"
 
-#: ../actions/recoverpassword.php:141
+#: ../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:67
+#: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr "Obnovyt kód pro neznámého uživatele"
 
-#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: 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/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "Odmítnout"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../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/updateprofile.php:69
+#: ../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/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "Vzdálený odběr"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: 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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "Odstranit OpenID"
 
@@ -1062,36 +1912,77 @@ msgstr ""
 "Odstranění jediného OpenID, bude mít za následek nemožnost dalšího "
 "přihlášení, nejprve přidejte jiné OpenID"
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
 msgid "Replies"
 msgstr "Odpovědi"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../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 "Odpovědi na %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "Reset"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "Resetovat heslo"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+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/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../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 "Uložit"
 
-#: ../lib/searchaction.php:73 ../lib/util.php:277
+#: ../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/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 #, fuzzy
 msgid "Search Stream Feed"
 msgstr ""
@@ -1099,14 +1990,15 @@ msgstr ""
 "Hledat ve Stream Feed\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearch.php:30
+#: ../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 ""
-"Hledej sdělení na %%site.name%% podle obsahu. Minimální délka musí "
-"být alespoň 3 znaky"
+"Hledej sdělení na %%site.name%% podle obsahu. Minimální délka musí být "
+"alespoň 3 znaky"
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1114,154 +2006,286 @@ 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"
+"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"
 
-#: ../lib/util.php:982
+#: ../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 "Odeslat"
 
-#: ../actions/imsettings.php:71
+#: ../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 "Zasílat oznámení pomocí Jabber/GTalk"
 
-#: ../lib/util.php:282
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr "Nastavení"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "Nastavení uloženo"
 
-#: ../actions/finishaddopenid.php:66
+#: ../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 "Někdo jiný již má toto 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ěco zvláštního se stalo"
 
-#: ../lib/util.php:302
+#: ../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 "Zdroj"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "Statistiky"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../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/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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/showstream.php:294 ../actions/subscribers.php:27
+#: ../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/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "Odběr autorizován"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "Odběr odmítnut"
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../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/avatar.php:87
+#: ../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/noticesearch.php:34
+#: ../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 "Vyhledávání textu"
 
-#: ../actions/openidsettings.php:140
+#: ../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/confirmaddress.php:52
+#: ../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/confirmaddress.php:43
+#: ../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/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "Soubor je příliš velký"
 
-#: ../actions/imsettings.php:161
+#: ../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/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+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/imsettings.php:201
+#: ../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 "Toto je špatná IM adresa"
 
-#: ../actions/newnotice.php:52
+#: ../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 "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
 
-#: ../actions/confirmaddress.php:86
+#: ../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/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/imsettings.php:241
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413
 msgid "The address was removed."
 msgstr "Adresa byla odstraněna"
 
-#: ../actions/userauthorization.php:311
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 "Odběr byl potvrzen, ale neprošla žádná callback adresa. Zkontrolujte v "
-"nápovědě jak správně postupovat při potvrzování odběru. Váš "
-"řetězec odběru je:"
+"nápovědě jak správně postupovat při potvrzování odběru. Váš řetězec odběru "
+"je:"
 
-#: ../actions/userauthorization.php:321
+#: ../actions/userauthorization.php:322
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"Odebírání bylo zamítnuto, ale neprošla žádná callback adresa. "
-"Zkontrolujte v nápovědě jak správně postupovat při zamítání odběru"
+"Odebírání bylo zamítnuto, ale neprošla žádná callback adresa. Zkontrolujte v "
+"nápovědě jak správně postupovat při zamítání odběru"
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Toto jsou lidé, kteří naslouchají %s sdělením"
 
-#: ../actions/subscribers.php:33
+#: ../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/subscriptions.php:35
+#: ../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/subscriptions.php:33
+#: ../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/recoverpassword.php:87
+#: ../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/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"
 
@@ -1270,82 +2294,157 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Tento formulář by se měl odeslat sám, pokud ne tak klikněte na "
-"tlašítko pro přechod k vašemu OpenID poskytovately."
+"Tento formulář by se měl odeslat sám, pokud ne tak klikněte na tlašítko pro "
+"přechod k vašemu OpenID poskytovately."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../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 ""
-"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."
+"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."
 
-#: ../lib/util.php:147
+#: ../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 "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/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+"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."
 msgstr ""
-"Pro odebírání, se musíte [přihlásit](%%action.login%%), nebo "
-"[registrovat](%%action.register%%) nový ú�et. Pokud již máte ú�et na "
-"[kompatibilních mikroblozích](%%doc.openmublog%%), vložte níže asdresu "
 
-#: ../actions/profilesettings.php:51
+#: ../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/remotesubscribe.php:74
+#: ../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/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../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/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323
 msgid "Unexpected password reset."
 msgstr "Ne�ekané resetování hesla."
 
+#: ../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 "Neznámá verze OMB protokolu."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
-"Pokud není uvedeno jinak, obsah těchto stránek chráněn autorským "
-"právem, patří přispěvatelů a je k dipozici pod"
+"Pokud není uvedeno jinak, obsah těchto stránek chráněn autorským právem, "
+"patří přispěvatelů a je k dipozici pod"
 
-#: ../actions/confirmaddress.php:48
+#: ../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:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Odhlásit"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../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/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr "Nepodporovaný formát obrázku."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "Upload"
 
@@ -1356,108 +2455,209 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Zde nahrajte nový obrázek k vašemu profilu. Po tom co nahrajete obrázek "
-"ho již nemůžete editovat, proto se ujistěte že jde víceméně o �tverec."
+"Zde nahrajte nový obrázek k vašemu profilu. Po tom co nahrajete obrázek ho "
+"již nemůžete editovat, proto se ujistěte že jde víceméně o �tverec."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../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 "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
 
 #: ../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/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../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/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "Přezdívka"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../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/profilesettings.php:57
+#: ../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/updateprofile.php:127
+#: ../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/updateprofile.php:122
+#: ../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/finishaddopenid.php:64
+#: ../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 "Již máte toto OpenID!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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 "Již jste přihlášen"
 
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Zde můžeze změnit heslo."
 
-#: ../actions/register.php:164
+#: ../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/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/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Můžete odstranit OpenID z vašeho ú�tu, kliknutím na tla�ítko "
-"\"Odebrat\"."
+"Můžete odstranit OpenID z vašeho ú�tu, kliknutím na tla�ítko \"Odebrat\"."
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"Můžete odesílat nebo přijámat sdělení pomocí Jabber/GTalk "
-"[zpráv](%%doc.im%%).Zadejte svou adresu níže."
+"Můžete odesílat nebo přijámat sdělení pomocí Jabber/GTalk [zpráv](%%doc.im%"
+"%).Zadejte svou adresu níže."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"Zde můžete aktualizovat informace o vašem profilu, aby se lidé o vás "
-"mohli více dozvědět."
+"Zde můžete aktualizovat informace o vašem profilu, aby se lidé o vás mohli "
+"více dozvědět."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: 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/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../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/updateprofile.php:62
+#: ../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/recoverpassword.php:134
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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 "Byl jste identifikován. Zadejte nové heslo"
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "Vaše OpenID adresa"
 
-#: ../actions/recoverpassword.php:149
+#: ../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"
 
@@ -1467,1372 +2667,2212 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"[OpenID](%%doc.openid%%) vám dovoluje použít stejný ú�et na více "
-"stránkách. Zde může spravovat vaše OpenID"
+"[OpenID](%%doc.openid%%) vám dovoluje použít stejný ú�et na více stránkách. "
+"Zde může spravovat vaše OpenID"
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "před pár sekundami"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "před %d dny"
 
-#: ../lib/util.php:822
+#: ../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"
 
-#: ../lib/util.php:818
+#: ../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"
 
-#: ../lib/util.php:830
+#: ../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"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "asi přede dnem"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "asi před minutou"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "asi před měsícem"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "asi před rokem"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "asi před hodinou"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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 "odpověd na ..."
 
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "odpově�"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "stejné jako heslo výše"
 
-#: ../lib/util.php:1127
+#: ../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 "« Novější"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
+#: 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/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: 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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
+msgid "%s favorite notices"
 msgstr ""
 
-#: ../actions/invite.php:168 actions/invite.php:176
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
+msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+#: 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:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
+#: actions/login.php:122 actions/login.php:264
+msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
+#: actions/login.php:126 actions/login.php:268
+msgid "Login with your username and password. "
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
+#: 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/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
+#: 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/register.php:213
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+msgid "No such user"
 msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
+#: actions/newmessage.php:117 actions/newmessage.php:67
+msgid "New message"
 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/noticesearch.php:95 actions/noticesearch.php:146
+msgid "Notice without matching profile"
 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/openidsettings.php:28 actions/openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+#: actions/outbox.php:53 actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+"Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
+msgid "You can update your personal profile info here "
 msgstr ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
+#: 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/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+msgid "This confirmation code is too old. "
 msgstr ""
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
 msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
 msgstr ""
 
-#: ../actions/register.php:202
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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...\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."
+"want to..."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: 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 "Could not follow user: %s is already on your list."
+msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
 msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
+#: actions/showstream.php:154
+msgid "Send a message"
 msgstr ""
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, php-format
+msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#, php-format
+msgid "Direct messages to %s"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
+msgid "No message text!"
 msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
+#: 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/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
-msgid "Feed for tag %s"
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
+#: 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 ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
+#: 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 ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+msgid "Twitter settings"
 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/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+msgid "Current verified Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
 msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
 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/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
+msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+msgid "Twitter settings saved."
 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/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
+msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
+#: 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/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+msgid "Twitter preferences saved."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
+msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
+msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+msgid "Command results"
 msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
+#: classes/Command.php:96 classes/Command.php:113
+#, php-format
+msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
+msgid "User has no last notice"
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
+#: classes/Command.php:146 classes/Command.php:166
+msgid "Notice marked as fave."
 msgstr ""
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
-msgid "Notices tagged with %s"
+msgid "Homepage: %s"
 msgstr ""
 
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
 msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
+#: classes/Command.php:295 classes/Command.php:335
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: 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:28 actions/register.php:28
-msgid "Registration not allowed."
+#: classes/Command.php:313 classes/Command.php:356
+msgid "Notification off."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
+#: classes/Message.php:53 classes/Message.php:56
+msgid "Could not insert message."
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
+#: classes/Message.php:63 classes/Message.php:66
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
 msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: lib/mail.php:253 lib/mail.php:512
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: lib/mailbox.php:43 lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: lib/openid.php:195 lib/openid.php:203
+msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+msgid "Favorites"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
 msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
 msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
+msgid "Twitter"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
+msgid "Twitter integration options"
 msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+msgid "Could not parse message."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
+#: 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."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Nastavení"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "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 ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
 msgstr ""
 
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
+#: actions/avatarsettings.php:334 actions/grouplogo.php:391
+#: classes/User_group.php:112
+#, 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 ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "Žádný takový uživatel."
+
+#: actions/block.php:129
+msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/block.php:162
+#, 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 ""
+
+#: actions/confirmaddress.php:159
+#, fuzzy, php-format
+msgid "The address \"%s\" has been "
+msgstr "Adresa byla odstraněna"
+
+#: actions/deletenotice.php:73
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
 #, php-format
-msgid "Updates from %1$s on %2$s!"
+msgid "Edit %s group"
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: 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/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: 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/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/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:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
+msgstr "Přezdívka může obsahovat pouze malá písmena a �ísla bez mezer"
+
+#: actions/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Nelze aktualizovat uživatele"
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "Nastavení uloženo"
+
+#: 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/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
 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/emailsettings.php:157
+msgid "Send me email when someone "
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: actions/emailsettings.php:321
+#, fuzzy
+msgid "That email address already belongs "
+msgstr "Emailová adresa již existuje"
+
+#: actions/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
 msgstr ""
+"Ověřující kód byl poslán na vloženou IM adresu. Musíte prokázat %s pro "
+"posílání zpráv."
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/facebookhome.php:110
+msgid "Server error - couldn't get user!"
+msgstr ""
+
+#: actions/facebookhome.php:196
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "If you would like the %s app to automatically update "
 msgstr ""
 
-#: ../lib/mail.php:147
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, 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 "Allow %s to update my Facebook status"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: actions/facebookhome.php:218
+msgid "Skip"
+msgstr ""
+
+#: actions/facebookhome.php:235
+#, fuzzy
+msgid "No notice content!"
+msgstr "Žádný obsah!"
+
+#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+msgid "Pagination"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
+#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#, fuzzy
+msgid "After"
+msgstr "« Novější"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#, fuzzy
+msgid "Before"
+msgstr "Starší »"
+
+#: actions/facebookinvite.php:70
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Feed přítel uživatele: %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
 msgstr ""
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Nelze aktualizovat uživatele"
+
+#: actions/facebooksettings.php:65
+msgid "There was a problem saving your sync preferences!"
 msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Favor"
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Nastavení uloženo"
+
+#: actions/facebooksettings.php:90
+msgid "Automatically update my Facebook status with my notices."
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Profil"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Nastavení"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: 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."
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
+msgstr ""
+
+#: actions/featured.php:71
 #, php-format
-msgid "%s favorite notices"
+msgid "Featured users, page %d"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/featured.php:99
 #, php-format
-msgid "Feed of favorite notices of %s"
+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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/inbox.php:28
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Obrázek nahrán"
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Nahrávání obrázku selhalo."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
-msgid "Inbox for %s - page %d"
+msgid "%s group members"
 msgstr ""
 
-#: actions/inbox.php:30
+#: actions/groupmembers.php:96
 #, php-format
-msgid "Inbox for %s"
+msgid "%s group members, page %d"
 msgstr ""
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr ""
+
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
 msgstr ""
 
-#: actions/invite.php:178
+#: actions/groups.php:64
 #, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+msgid "Groups, page %d"
 msgstr ""
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
+#: actions/groups.php:90
+#, php-format
+msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#, fuzzy
+msgid "Create a new group"
+msgstr "Vytvořit nový ú�et"
+
+#: actions/groupsearch.php:57
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
 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/login.php:126
-msgid "Login with your username and password. "
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "Hledání lidí"
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
 msgstr ""
 
-#: actions/newmessage.php:65
-msgid "No recipient specified."
+#: actions/imsettings.php:147
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk "
+msgstr "Zasílat oznámení pomocí Jabber/GTalk"
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Žádný potvrzující kód."
+
+#: actions/joingroup.php:65
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
+#: actions/joingroup.php:95
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Již jste přihlášen"
+
+#: actions/joingroup.php:128
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Nelze přesměrovat na server: %s"
+
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/newmessage.php:108
-msgid "No such user"
+#: actions/leavegroup.php:65
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/newmessage.php:117
-msgid "New message"
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "Žádné takové oznámení."
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Neodeslal jste nám profil"
+
+#: actions/leavegroup.php:100
+msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
+#: actions/leavegroup.php:130
+msgid "Could not find membership record."
 msgstr ""
 
-#: actions/openidsettings.php:28
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Nelze vytvořit OpenID z: %s"
+
+#: actions/leavegroup.php:145
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgid "%s left group %s"
 msgstr ""
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: actions/outbox.php:28
-#, php-format
-msgid "Outbox for %s - page %d"
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/outbox.php:30
-#, php-format
-msgid "Outbox for %s"
+#: actions/newgroup.php:177
+#, fuzzy
+msgid "Could not create group."
+msgstr "Nelze uložin informace o obrázku"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Nelze vytvořit odebírat"
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "Soubor je příliš velký"
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "Sdělení"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
 msgstr ""
 
-#: actions/peoplesearch.php:28
-#, php-format
+#: actions/nudge.php:85
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
+#: actions/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "OpenID přihlášení"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Odstranit OpenID"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Nastavení"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
 msgstr ""
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "Hledat"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Změnit heslo"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "Heslo uloženo"
+
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Není platnou mailovou adresou."
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
+#: actions/peopletag.php:91
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "Neznámý profil"
+
+#: actions/profilesettings.php:124
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
+#: actions/profilesettings.php:144
+msgid "Automatically subscribe to whoever "
 msgstr ""
 
-#: actions/register.php:216
+#: 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."
+msgstr ""
+
+#: actions/public.php:220
 #, php-format
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Veřejný Stream Feed\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: actions/remotesubscribe.php:51
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/showfavorites.php:61
-#, php-format
-msgid "Feed for favorites of %s"
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/showmessage.php:33
-msgid "No such message."
+#: actions/register.php:149
+#, fuzzy
+msgid "You can't register if you don't "
+msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
+
+#: actions/register.php:286
+msgid "With this form you can create "
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: 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."
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Popiš sebe a své zájmy ve 140 znacích"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "Místo. Město, stát."
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
 msgstr ""
+"až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní �íslo."
 
-#: actions/showmessage.php:61
+#: actions/register.php:471
 #, php-format
-msgid "Message to %1$s on %2$s"
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr ""
 
-#: actions/showmessage.php:66
-#, php-format
-msgid "Message from %1$s on %2$s"
+#: actions/register.php:495
+msgid "(You should receive a message by email "
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
+msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/smssettings.php:312
+#: actions/replies.php:118
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Odpovědi na %s"
+
+#: actions/showfavorites.php:79
 #, php-format
-msgid "Mobile carrier for your phone. "
+msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
-msgid "Direct messages to %s"
+msgid "%s group"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/showgroup.php:79
 #, php-format
-msgid "All the direct messages sent to %s"
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
+#: 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"
+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"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Feed sdělení pro %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
+msgid "Members"
+msgstr "ÄŒlenem od"
+
+#: actions/showgroup.php:363 actions/showstream.php:413
+#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr ""
+
+#: actions/showgroup.php:370
+msgid "All members"
+msgstr ""
+
+#: actions/showgroup.php:378
 #, php-format
-msgid "All the direct messages sent from %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: 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"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Odběratelé"
+
+#: actions/showstream.php:533
+msgid "All groups"
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/showstream.php:542
 #, php-format
-msgid "%s / Favorites from %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+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"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: 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é"
+
+#: actions/subscribers.php:52
 #, php-format
-msgid "%s updates favorited by %s / %s."
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: 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
+#, 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"
+
+#: actions/subscriptions.php:122
+#, 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"
+
+#: actions/tag.php:66
 #, php-format
-msgid "%s added your notice as a favorite"
+msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: 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
 #, php-format
+msgid "Tag %s"
+msgstr ""
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr ""
+
+#: actions/tagother.php:149
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/tagother.php:164
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/tagother.php:191
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
+#: 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."
 msgstr ""
 
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
+#: 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."
 msgstr ""
 
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: 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 ""
 
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Nové heslo"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
 msgstr ""
 
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
 msgstr ""
 
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
+#: actions/twittersettings.php:341
+#, fuzzy, php-format
+msgid "Unable to retrieve account information "
+msgstr "Nelze smazat potvrzení emailu"
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Chyba při ukládaní uživatele"
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Nebylo vráceno žádné URL profilu od servu."
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Vzdálený profil s nesouhlasícím profilem"
+
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Odhlásit"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
 msgstr ""
 
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Problém při ukládání sdělení"
+
+#: classes/Notice.php:109
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Nahrávání obrázku selhalo."
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr ""
+
+#: lib/action.php:130
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgid "%s - %s"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
+#: lib/action.php:145
+msgid "Untitled page"
 msgstr ""
 
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
+#: lib/action.php:316
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
+#: lib/action.php:325
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "O nás"
+
+#: lib/action.php:328
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
+#: lib/action.php:332
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
+#: lib/action.php:335
+msgid "Login to the site"
 msgstr ""
 
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Vytvořit nový ú�et"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "Žádné takové OpenID"
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Nápověda"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "Nové sdělení"
+
+#: lib/action.php:417
+msgid "Local views"
 msgstr ""
 
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "Nové sdělení"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Odběry"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
 msgstr ""
 
-#: classes/Channel.php:113
-msgid "Command results"
+#: lib/action.php:630
+msgid "All "
 msgstr ""
 
-#: classes/Channel.php:148
-msgid "Command complete"
+#: lib/action.php:635
+msgid "license."
 msgstr ""
 
-#: classes/Channel.php:158
-msgid "Command failed"
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Žádný takový uživatel."
+
+#: lib/blockform.php:153
+msgid "Block"
 msgstr ""
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
 msgstr ""
 
-#: classes/Command.php:96
+#: lib/facebookaction.php:268
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
+#: 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/feedlist.php:64
+msgid "Export data"
 msgstr ""
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
+#: lib/galleryaction.php:121
+msgid "Filter tags"
 msgstr ""
 
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
+#: lib/galleryaction.php:131
+msgid "All"
 msgstr ""
 
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
+#: lib/galleryaction.php:137
+msgid "Tag"
 msgstr ""
 
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
+#: lib/galleryaction.php:139
+msgid "Go"
 msgstr ""
 
-#: classes/Command.php:178
-#, php-format
-msgid "About: %s"
+#: lib/groupeditform.php:148
+#, 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
+#, fuzzy
+msgid "Description"
+msgstr "Odběry"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Popiš sebe a své zájmy ve 140 znacích"
+
+#: lib/groupeditform.php:158
+#, 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"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
 msgstr ""
 
-#: classes/Command.php:200
+#: lib/groupnav.php:101
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Edit %s group properties"
 msgstr ""
 
-#: classes/Command.php:214
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Odhlásit"
+
+#: lib/groupnav.php:107
 #, php-format
-msgid "Direct message to %s sent"
+msgid "Add or edit %s logo"
 msgstr ""
 
-#: classes/Command.php:216
-msgid "Error sending direct message."
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
 msgstr ""
 
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
 msgstr ""
 
-#: classes/Command.php:270
+#: lib/grouptagcloudsection.php:56
 #, php-format
-msgid "Subscribed to %s"
+msgid "Tags in %s group's notices"
 msgstr ""
 
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Tato stránka není k dispozici v typu média která přijímáte."
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Přihlásit"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Uložit"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Neplatné jméno nebo heslo"
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Vytvořit nový ú�et"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
 msgstr ""
 
-#: classes/Command.php:295
+#: lib/mail.php:175
 #, php-format
-msgid "Unsubscribed from %s"
+msgid ""
+"Hey, %s.\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1 od te� naslouchá tvým sdělením v %2"
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Umístění"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Moje stránky"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:313
-msgid "Notification off."
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
 msgstr ""
 
-#: classes/Command.php:315
-msgid "Can't turn off notification."
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr ""
 
-#: classes/Command.php:333
-msgid "Notification on."
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1 od te� naslouchá tvým sdělením v %2"
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
 msgstr ""
 
-#: classes/Command.php:335
-msgid "Can't turn on notification."
+#: lib/messageform.php:110
+msgid "Send a direct notice"
 msgstr ""
 
-#: classes/Command.php:344
-msgid "Commands:\n"
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "Nové sdělení"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 a více znaků"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "odpověd na ..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
 msgstr ""
 
-#: classes/Message.php:53
-msgid "Could not insert message."
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "odpově�"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+msgid "Delete this notice"
 msgstr ""
 
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
+#: lib/noticelist.php:474
+msgid "Delete"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
 msgstr ""
 
-#: lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: lib/nudgeform.php:128
+msgid "Nudge"
 msgstr ""
 
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/personaltagcloudsection.php:56
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
+#: lib/profilelist.php:182
+msgid "(none)"
 msgstr ""
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
-msgstr ""
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Veřejné"
 
-#: lib/personal.php:65
-msgid "Favorites"
+#: lib/publicgroupnav.php:80
+msgid "User groups"
 msgstr ""
 
-#: lib/personal.php:66
-#, php-format
-msgid "%s's favorite notices"
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
 msgstr ""
 
-#: lib/personal.php:66
-msgid "User"
+#: lib/publicgroupnav.php:86
+msgid "Featured"
 msgstr ""
 
-#: lib/personal.php:75
-msgid "Inbox"
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "Hledání lidí"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Sdělení"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
 msgstr ""
 
-#: lib/personal.php:76
-msgid "Your incoming messages"
+#: lib/section.php:89
+msgid "Untitled section"
 msgstr ""
 
-#: lib/personal.php:80
-msgid "Outbox"
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Vzdálený odběr"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Vzdálený odběr"
+
+#: lib/subgroupnav.php:97
+#, php-format
+msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/personal.php:81
-msgid "Your sent messages"
+#: lib/subgroupnav.php:104
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/settingsaction.php:99
-msgid "Twitter"
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Uživatel nemá profil."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Odběr autorizován"
+
+#: lib/tagcloudsection.php:56
+msgid "None"
 msgstr ""
 
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
+#: lib/topposterssection.php:74
+msgid "Top posters"
 msgstr ""
 
-#: lib/util.php:1718
-msgid "To"
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "Žádný takový uživatel."
+
+#: lib/unblockform.php:150
+msgid "Unblock"
 msgstr ""
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "Vytvořit nový ú�et"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Nelze potvrdit email"
+
+#~ msgid "Email address"
+#~ msgstr "Emailová adresa"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Chyba při vkládání nového sdělení"
+
+#~ 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."
diff --git a/locale/de_DE/LC_MESSAGES/laconica.mo b/locale/de_DE/LC_MESSAGES/laconica.mo
index ce6144851..54db03dff 100644
--- a/locale/de_DE/LC_MESSAGES/laconica.mo
+++ b/locale/de_DE/LC_MESSAGES/laconica.mo
diff --git a/locale/de_DE/LC_MESSAGES/laconica.po b/locale/de_DE/LC_MESSAGES/laconica.po
index 8ed32027b..aadde3208 100644
--- a/locale/de_DE/LC_MESSAGES/laconica.po
+++ b/locale/de_DE/LC_MESSAGES/laconica.po
@@ -3,49 +3,114 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Markus Heurung <muhh@byzero.de>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-01-29 15:47+0000\n"
+"Last-Translator: Mathias <mathias.reinhardt@web.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../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:193
+#: ../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."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
-"außer folgenden privaten Daten: Passwort, E-Mail, Adresse, IM Adresse, "
+"außer folgende private Daten: Passwort, E-Mail, Adresse, IM Adresse, "
 "Telefonnummer."
 
-#: ../actions/subscribe.php:84
+#: ../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."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -62,123 +127,297 @@ msgstr ""
 "Gruß,\n"
 "%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../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 "%1$s Status auf %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../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 öffentlicher Stream"
 
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#: ../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 und Freunde"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33
+#, php-format
+msgid "%s public timeline"
+msgstr "%s öffentliche Zeitleiste"
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#, 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"
+msgstr "%s Zeitleiste"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, 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.)"
+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
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** ist ein Microbloggingdienst von "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)."
+"**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%"
+"site.broughtbyurl%%)."
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** ist ein Microbloggingdienst."
 
-#: ../lib/util.php:250
+#: ../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/register.php:176
+#: 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/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. "
+"Pflicht."
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
 msgstr "6 oder mehr Zeichen"
 
-#: ../actions/recoverpassword.php:165
+#: ../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/imsettings.php:188
+#: ../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
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
 "Ein Bestätigungscode wurde an die IM Adresse geschickt, die du hinzugefügt "
 "hast. Du musst zulassen, dass %s dir Nachrichten schicken darf."
 
-#: ../lib/util.php:296
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"Ein Bestätigungscode wurde an die angegebene E-Mail Adresse geschickt. "
+"Überprüfen Sie Ihren Posteingang (auch den Spamordner!) für den Code und "
+"Anweisungen, wie dieser benutzt wird."
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"Ein Bestätigungscode wurde an die von Ihnen angegebene Telefonnummer "
+"gesandt. Überprüfen Sie bitte Ihren Posteingang (auch den Spamordner!) auf "
+"den Code und die Anweisungen, um ihn zu benutzen."
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55 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 "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/twitapilaconica.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:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "OpenID hinzufügen"
 
-#: ../actions/imsettings.php:39
+#: ../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/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+msgid "Addresses of friends to invite (one per line)"
+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:62
+#: ../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/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Alle Aktualisierungen, die den Suchbegriff \"%s\" enthalten"
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "Bereits abonniert!"
 
-#: ../actions/userauthorization.php:76
+#: ../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/userauthorization.php:77 actions/userauthorization.php:83
+#: actions/userauthorization.php:81
 msgid "Authorize subscription"
 msgstr "Abonnement bestätigen"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
-msgstr "Automatisch einloggen; Nicht bei gemeinsam genutzten PCs!"
+msgstr "Automatisch einloggen; Nicht bei gemeinsam genutzten PCs einsetzen!"
+
+#: ../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/avatar.php:32
+#: ../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/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "Avatar aktualisiert."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -188,276 +427,523 @@ msgstr ""
 "sollte in deinem Jabber/GTalk Konto eingehen. (Hast du %s zu deiner "
 "Freundeliste hinzugefügt?)"
 
-#: ../lib/util.php:1136
+#: ../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."
+
+#: ../lib/util.php:1318 lib/util.php:1452
+#, fuzzy
 msgid "Before »"
 msgstr "Früher »"
 
-#: ../actions/profilesettings.php:52
+#: ../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/profilesettings.php:93 ../actions/updateprofile.php:102
+#: ../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/updateprofile.php:118
+#: ../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/updateprofile.php:119 actions/updateprofile.php:120
+#: actions/updateprofile.php:123
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Konnte Avatar-URL nicht öffnen '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+#: ../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/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../lib/openid.php:121
+#: ../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/imsettings.php:154
+#: ../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/password.php:45
+#: ../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/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "Ändern"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr "Ändere die E-Mail Verarbeitung"
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+msgid "Change your password"
+msgstr "Ändere dein Passwort"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: lib/accountsettingsaction.php:105
+msgid "Change your profile settings"
+msgstr "Ändern der Profileinstellungen"
+
+#: ../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/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Adresse bestätigen"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "Bestätigung abgebrochen."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr "Bestätigungscode"
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Bestätigungscode nicht gefunden."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../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 ""
+"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\n"
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "Verbinden"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "Verbinde bestehendes Konto"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Konnte OpenID-Formular nicht erstellen: %s"
 
-#: ../lib/openid.php:160
+#: ../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/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"
+
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Konnte nicht zum Server umleiten: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../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:154
+#: ../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."
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "E-Mail konnte nicht bestätigt werden."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#, fuzzy
+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."
+
+#: ../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/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/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Konnte Abonnement nicht erstellen."
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: 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/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
 msgstr "Konnte Abonnement nicht löschen."
 
-#: ../actions/remotesubscribe.php:125
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:84
+msgid "Couldn't find any statuses."
+msgstr "Konnte keine Statusmeldungen finden."
+
+#: ../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/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: 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/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
 msgid "Couldn't insert new subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
-#: ../actions/profilesettings.php:175
+#: ../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/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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/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/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/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Erstellen"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "Neues Konto anlegen"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../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/imsettings.php:45
+#: ../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/showstream.php:337
+#: ../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/emailsettings.php:44 actions/emailsettings.php:45
+#: actions/emailsettings.php:99
+msgid "Current confirmed email address."
+msgstr "Aktuelle bestätigte E-Mail Adresse"
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
 msgstr "Momentan"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+#: actions/deletenotice.php:79
+msgid "Delete notice"
+msgstr "Notiz löschen"
+
+#: ../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/register.php:181
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "E-Mail"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "E-Mail Adresse "
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
+msgid "Email Address"
+msgstr "E-Mail Adresse"
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "E-Mail Einstellungen"
+
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
 msgid "Email address already exists."
 msgstr "Diese E-Mail Adresse existiert bereits."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
 msgstr "Bestätigung der E-Mail Adresse"
 
-#: ../actions/recoverpassword.php:176
+#: ../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/invite.php:129 actions/invite.php:137 actions/invite.php:174
+msgid "Email addresses"
+msgstr "E-Mail Adressen"
+
+#: ../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/userauthorization.php:136
+#: ../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/userauthorization.php:137 actions/userauthorization.php:144
+#: actions/userauthorization.php:161
 msgid "Error authorizing token"
 msgstr "Fehler beim Autorisieren des Tokens"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../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/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+#: actions/finishaddopenid.php:126
 msgid "Error connecting user."
 msgstr "Fehler beim Verbinden des Nutzers."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
 msgid "Error inserting avatar"
 msgstr "Fehler beim Einfügen des Avatars"
 
 #: ../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/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Fehler beim Einfügen der Nachricht"
-
 #: ../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/recoverpassword.php:201
+#: ../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/userauthorization.php:139
+#: ../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/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving the profile."
 msgstr "Fehler bei Speichern des Profils."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
 msgid "Error saving the user."
 msgstr "Fehler beim Speichern des Nutzers."
 
-#: ../actions/password.php:80
+#: ../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/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 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/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
 msgid "Error updating profile"
 msgstr "Fehler beim Update des Profils"
 
 #: ../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/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+#: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
 msgstr "Fehler beim Bestätigungscode."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "Nick wird bereits verwendet"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "FAQ"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "Aktualisierung des Avatars fehlgeschlagen"
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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:61 ../actions/repliesrss.php:80
+#: ../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/login.php:118
+#: ../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"
+
+#: ../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/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -465,39 +951,69 @@ msgstr ""
 "Bitte geben Sie aus Sicherheitsgründen ihren Benutzernamen und ihr Passwort "
 "ein, bevor die Änderungen an ihren Einstellungen vorgenommen werden."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/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/profilesettings.php:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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)"
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "Startseite"
 
-#: ../actions/profilesettings.php:49
+#: ../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:87
+#: ../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."
 
-#: ../actions/imsettings.php:61
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:173
+#, fuzzy
+msgid "I want to post notices by email."
+msgstr "Ich möchte Einträge per E-Mail posten."
+
+#: ../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 Adresse"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "IM Einstellungen"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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."
@@ -513,23 +1029,37 @@ msgstr ""
 "Wenn du deinem Konto eine OpenID hinzufügen möchtest, dann trage sie hier "
 "ein und klicke auf \"Hinzufügen\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"Wenn du deine Passwort verlegt hast, kannst du dir ein Neues an die "
-"E-Mailadresse schicken lasssen, die für dein Konto eingetragen ist."
+"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/password.php:69
+#: ../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/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:443
+msgid "Incoming email address removed."
+msgstr "Eingehende E-Mail Adresse entfernt"
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153
 msgid "Incorrect old password"
 msgstr "Altes Passwort falsch"
 
-#: ../actions/login.php:63
+#: ../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/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -537,72 +1067,107 @@ msgstr ""
 "Anweisungen für die Wiederherstellung deines Passworts wurden an deine "
 "hinterlegte E-Mailadresse geschickt."
 
-#: ../actions/updateprofile.php:113
+#: ../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/updateprofile.php:97
+#: ../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/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ungültige Homepage '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Ungültige Lizenz-URL '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../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: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:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "Ungültige Nachrichten-URL"
 
-#: ../actions/updateprofile.php:86
+#: ../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/remotesubscribe.php:96
+#: ../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/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/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Ungültige Größe."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
 msgid "Invalid username or password."
 msgstr "Benutzername oder Passwort falsch."
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+msgid "Invitation(s) sent"
+msgstr "Einladung(en) verschickt"
+
+#: ../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:"
+
+#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
+#: lib/subgroupnav.php:103
+msgid "Invite"
+msgstr "Einladen"
+
+#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+msgid "Invite new users"
+msgstr "Lade neue Leute ein"
+
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, php-format
 msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 " Es wird mit der Microbloggingsoftware [Laconica](http://laconi.ca/) "
-"(Version %s) betrieben, die unter der [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich "
-"ist."
+"(Version %s) betrieben, die unter der [GNU Affero General Public License]"
+"(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
 
-#: ../actions/imsettings.php:164
+#: ../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/imsettings.php:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -612,339 +1177,636 @@ msgstr ""
 "versichere dich zuerst, dass du %s in deine Kontaktliste in deinem IM "
 "Programm oder GTalk aufgenommen hast."
 
-#: ../actions/profilesettings.php:55
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:128
+msgid "Language"
+msgstr "Sprache"
+
+#: ../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/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/profilesettings.php:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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 "Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
-
-#: ../actions/login.php:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
+
+#: ../actions/login.php:97 ../actions/login.php:106
+#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php: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/openidlogin.php:44
+#: ../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/login.php:122
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
 "Melde dich mit Nutzernamen und Passwort an. Du hast noch keinen Nutzernamen? "
 "[Registriere](%%action.register%%) ein neues Konto oder versuche es mit "
 "[OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Abmelden"
 
-#: ../actions/login.php:106
+#: ../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/login.php:110 actions/login.php:110 actions/login.php:245
+#: lib/facebookaction.php:320
 msgid "Lost or forgotten password?"
 msgstr "Passwort vergessen?"
 
-#: ../actions/showstream.php:281
+#: ../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/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."
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:480
 msgid "Member since"
 msgstr "Mitglied seit"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog von %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+"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/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/finishopenidlogin.php:71
+#: ../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"
+
+#: ../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:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:465
+msgid "New incoming email address added."
+msgstr "Neue Eingangs-Emailadresse hinzugefügt."
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+#: actions/finishopenidlogin.php:99
 msgid "New nickname"
 msgstr "Neuer Nutzername"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "Neue Nachricht"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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/recoverpassword.php:275
+#: ../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:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../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/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59
+#: ../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/finishopenidlogin.php:165 ../actions/profilesettings.php:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
 msgstr "Nutzername nicht erlaubt."
 
-#: ../actions/remotesubscribe.php:72
+#: ../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/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "Nutzername oder E-Mail"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
+msgid "No"
+msgstr "Nein"
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
+#: actions/imsettings.php:279
 msgid "No Jabber ID."
 msgstr "Keine Jabber-ID"
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "Keine Bestätigungsanfrage!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+#: actions/smssettings.php:299
+msgid "No carrier selected."
+msgstr "Kein Netzanbieter ausgewählt."
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+#: actions/smssettings.php:486
+msgid "No code entered"
+msgstr "Kein Code eingegeben"
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
+#: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "Kein Bestätigungs-Code."
 
-#: ../actions/newnotice.php:49
+#: ../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/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:304
+msgid "No email address."
+msgstr "Keine E-Mail Adresse."
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
 msgid "No id."
 msgstr "Keine ID."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:430
+#, fuzzy
+msgid "No incoming email address."
+msgstr "Keine Eingangs-Emailadresse"
+
 #: ../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/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
 msgstr "Kein Nutzername."
 
-#: ../actions/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: actions/emailsettings.php:363 actions/imsettings.php:345
+#: actions/smssettings.php:358
 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/recoverpassword.php:189
+#: ../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:48
+#: ../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/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "Keine Größe."
 
-#: ../actions/openidsettings.php:135
+# 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."
+
+# 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/openidsettings.php:135 actions/openidsettings.php:144
+#: actions/openidsettings.php:222
 msgid "No such OpenID."
 msgstr "Diese OpenID ist nicht bekannt."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "Unbekanntes Dokument."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+#: actions/recoverpassword.php:62
 msgid "No such recovery code."
 msgstr "Unbekannter Wiederherstellungscode."
 
-#: ../actions/postnotice.php:56
+#: ../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:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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."
 
-#: ../lib/gallery.php:76
+#: ../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."
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Niemand anzuzeigen!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+#: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr "Kein Wiederherstellungscode."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Kein registrierter Nutzer."
+
+#: ../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/imsettings.php:167 actions/imsettings.php:175
+#: actions/imsettings.php:290
 msgid "Not a valid Jabber ID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "Ungültige OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../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/register.php:63 actions/register.php:70 actions/register.php:152
 msgid "Not a valid email address."
 msgstr "Ungültige E-Mail-Adresse."
 
-#: ../actions/profilesettings.php:83 ../actions/register.php:61
+#: ../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/remotesubscribe.php:118
+#: ../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/remotesubscribe.php:111
+#: ../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/remotesubscribe.php:104
+#: ../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/avatar.php:95
+#: ../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/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "Nicht autorisiert."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "Unerwartete Antwort!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/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."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "Nicht abonniert!"
 
-#: ../actions/showstream.php:82
+#: ../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:39
+#: actions/shownotice.php:94
 msgid "Notice has no profile"
 msgstr "Nachricht hat kein Profil"
 
-#: ../actions/showstream.php:297
+#: ../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/password.php:39
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "Altes Passwort"
 
-#: ../lib/util.php:288
+#: ../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: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: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/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:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID-Fehler: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "OpenID-Einstellungen"
 
-#: ../actions/avatar.php:84
+#: ../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/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:98
-#: ../actions/register.php:177
+#: ../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/recoverpassword.php:249
+#: ../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/recoverpassword.php:245
+#: ../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/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../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/password.php:89 ../actions/recoverpassword.php:274
+#: ../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/password.php:61 ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Leute"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#: actions/opensearch.php:64
+#, fuzzy
+msgid "People Search"
+msgstr "Suchen von Personen"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Suche nach anderen Nutzern"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "Eigene"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr "Private Nachricht"
+
+#: ../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/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, "
@@ -954,91 +1816,156 @@ msgstr ""
 "dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
 "\"Abbrechen\"."
 
-#: ../actions/imsettings.php:74
+#: ../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/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "Einstellungen gesichert."
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:129
+msgid "Preferred language"
+msgstr "Bevorzugte Sprache"
+
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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."
 
-#: ../lib/stream.php:54
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "Profil-URL"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
 msgstr "Profil Einstellungen"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Öffentlich"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Feed des öffentlichen Streams"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "Öffentliche Zeitleiste"
 
-#: ../actions/recoverpassword.php:151
+#: ../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/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/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr "Neueste Tags"
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr "Wiederherstellung"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198
 msgid "Recover password"
 msgstr "Stelle Passwort wieder her"
 
-#: ../actions/recoverpassword.php:67
+#: ../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/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: 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/userauthorization.php:119
+#: ../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/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr "Registrierung erfolgreich"
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "Ablehnen"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../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/updateprofile.php:69
+#: ../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/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "Entferntes Abonnement"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: 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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "Entferne OpenID"
 
@@ -1050,40 +1977,82 @@ 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:49
+#: ../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:50
+#: ../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 "Antworten an %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr "SMS Telefonnummer"
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS Einstellungen"
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr "SMS Konfiguration"
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
 msgid "Same as password above"
 msgstr "Gleiches Passwort wie zuvor"
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../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/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"
 
-#: ../lib/searchaction.php:73 ../lib/util.php:277
+#: ../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/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "Stream-Feed suchen"
 
-#: ../actions/noticesearch.php:30
+#: ../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 "
@@ -1103,116 +2072,249 @@ msgstr ""
 "Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus "
 "mindestens 3 Zeichen bestehen."
 
-#: ../lib/util.php:982
+#: ../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/imsettings.php:71
+#: ../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."
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
+#: actions/imsettings.php:137
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
 
-#: ../lib/util.php:282
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#, fuzzy
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Schicke mir Nachrichten per SMS; ich weiss, dass mir dadurch hohe Kosten bei "
+"meinem Netzbetreiber entstehen können."
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#, fuzzy
+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:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
-#: ../actions/finishaddopenid.php:66
+#: ../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."
 
-#: ../lib/util.php:302
+#: ../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."
+
+#: ../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:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../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:172
-#: ../actions/showstream.php:181
+#: ../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:294 ../actions/subscribers.php:27
+#: ../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:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "Abonnement autorisiert"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "Abonnement abgelehnt"
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../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/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
 msgid "System error uploading file."
 msgstr "Systemfehler beim hochladen der Datei."
 
-#: ../actions/noticesearch.php:34
+#: ../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: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:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "Diese Adresse wurde bereits bestätigt."
 
-#: ../actions/confirmaddress.php:43
+#: ../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/avatar.php:80
+#: ../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/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:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr "Diese JabberID hast du schon angegeben."
 
-#: ../actions/imsettings.php:224
+#: ../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/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:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr "Dies ist nicht deine JabberID."
 
-#: ../actions/imsettings.php:201
+#: ../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/newnotice.php:52
+#: ../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/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/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 ""
-"Das war zu lang. Die Länge einer Nachricht ist auf 140 Zeichen "
-"beschränkt."
+"Das war zu lang. Die Länge einer Nachricht ist auf 140 Zeichen beschränkt."
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:62
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+"Das war zu lang. Die Länge einer Nachricht ist auf 255 Zeichen beschränkt."
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Die Adresse \"%s\" wurde für dein Konto bestätigt."
 
-#: ../actions/imsettings.php:241
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413
 msgid "The address was removed."
 msgstr "Die Adresse wurde entfernt."
 
-#: ../actions/userauthorization.php:311
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
@@ -1222,7 +2324,7 @@ msgstr ""
 "zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements "
 "bestätigt werden. Dein Abonnement-Token ist:"
 
-#: ../actions/userauthorization.php:321
+#: ../actions/userauthorization.php:322
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
@@ -1232,25 +2334,33 @@ msgstr ""
 "zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements "
 "vollständig abgelehnt werden. Dein Abonnement-Token ist:"
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Dies sind die Leute, die %ss Nachrichten lesen."
 
-#: ../actions/subscribers.php:33
+#: ../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/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, 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 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Dies sind die Leute, deren Nachrichten du liest."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#, fuzzy
+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."
 
@@ -1262,7 +2372,8 @@ msgstr ""
 "Dieses Formular sollte automatisch übermittelt werden. Wenn nicht, dann "
 "klicke auf \"Senden\", um zu deinem OpenID-Anbieter zu gelangen."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../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 "
@@ -1273,46 +2384,93 @@ msgstr ""
 "deine OpenID mit einem lokalen Konto verbinden. Du kannst entweder ein neues "
 "Konto erstellen oder mit einem vorhandenen Konto anmelden."
 
-#: ../lib/util.php:147
+#: ../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
+#, fuzzy
+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
+#, fuzzy
+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"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr "Keine Zeitzone ausgewählt."
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 "Für ein Abonnement kannst du dich entweder [einloggen](%%action.login%%) "
 "oder ein neues Konto [registrieren](%%action.register%%). Wenn du schon ein "
 "Konto auf einer [kompatiblen Microbloggingsite](%%doc.openmublog%%) hast, "
 "dann gib deine Profil-URL unten an."
 
-#: ../actions/profilesettings.php:51
+#: ../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 deiner Homepage, deines Blogs, oder deines Profils auf einer anderen "
-"Site"
+"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
 
-#: ../actions/remotesubscribe.php:74
+#: ../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/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../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:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323
 msgid "Unexpected password reset."
 msgstr "Unerwarteter Passwortreset."
 
+#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+msgid "Unknown action"
+msgstr "Unbekannter Befehl"
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
 msgid "Unknown version of OMB protocol."
 msgstr "Unbekannte OMB-Protokollversion."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1320,24 +2478,52 @@ 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:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Nicht erkannter Adresstyp %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../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/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr "Bildformat wird nicht unterstützt."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr "Updates via SMS"
+
+#: ../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/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 von %1$s und Freunden auf %2$s!"
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "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"
 
@@ -1354,65 +2540,128 @@ msgstr ""
 "Verfügung gestellt werden. Nutze also ein Bild, das dir gehört und das du "
 "auch weitergeben möchtest."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../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:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../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."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "Benutzername"
 
-#: ../lib/util.php:969 ../lib/util.php:1159 lib/util.php:1293
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr "Benutzer nicht gefunden."
+
+#: ../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?"
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
-#, fuzzy
 msgid "What's up, %s?"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Was ist los, %s?\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "Was ist los, %s?\n"
 
-#: ../actions/profilesettings.php:57
+#: ../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\""
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Falscher Bildtyp für '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../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/finishaddopenid.php:64
+#: ../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 "Diese OpenID hast du schon angegeben!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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 "Du bist bereits angemeldet!"
 
+#: ../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/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Hier kannst du dein Passwort ändern. Wähle ein Gutes!"
 
-#: ../actions/register.php:164
+#: ../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/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/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -1421,46 +2670,80 @@ msgstr ""
 "Du kannst eine OpenID aus deinem Konto entfernen, indem du auf \"Entfernen\" "
 "klickst."
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
 "Du kannst Nachrichten mittels [Jabber/GTalk IM](%%doc.im%%) empfangen und "
 "senden. Stelle deine Adresse und Einstellungen unten ein."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 "Du kannst dein Profil auf den neusten Stand bringen, damit andere Leute mehr "
 "über dich erfahren können."
 
 #: ../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!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../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 kannst dich nicht registrieren, wenn du die Lizenz nicht "
-"akzeptierst."
+"Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
 
-#: ../actions/updateprofile.php:62
+#: ../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"
 
-#: ../actions/recoverpassword.php:134
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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 "Du wurdest indentifiziert. Bitte trage unten ein neues Passwort ein."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "Deine OpenID URL"
 
-#: ../actions/recoverpassword.php:149
+#: ../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."
 
@@ -1471,1384 +2754,2286 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 "Mit [OpenID](%%doc.openid%%) kannst du dich bei mehreren Sites mit demselben "
-"Nutzerkonto anmelden. Hier kannst du deine verknüpften OpenIDs "
-"verwalten."
+"Nutzerkonto anmelden. Hier kannst du deine verknüpften OpenIDs verwalten."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "vor wenigen Sekunden"
 
-#: ../lib/util.php:826
+#: ../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:822
+#: ../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:818
+#: ../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:830
+#: ../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:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "vor einem Tag"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "vor einer Minute"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "vor einem Monat"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "vor einem Jahr"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "vor einer Stunde"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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 "als Antwort auf... "
 
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "antworten"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "Gleiches Passwort wie zuvor"
 
-#: ../lib/util.php:1127
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:555
+msgid "unsupported file type"
+msgstr "Nicht unterstützer Datei Typ"
+
+#: ../lib/util.php:1309 lib/util.php:1443
+#, fuzzy
 msgid "« After"
 msgstr "« Später"
 
-#: ../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/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 "Es gab ein Problem mit deinem Session Token. Bitte versuche es erneut."
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
+#: actions/disfavor.php:55 actions/disfavor.php:81
+msgid "This notice is not a favorite!"
 msgstr ""
 
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
+#: actions/disfavor.php:63 actions/disfavor.php:87
+msgid "Could not delete favorite."
 msgstr ""
 
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
+#: actions/disfavor.php:72 lib/favorform.php:140
+msgid "Favor"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: actions/emailsettings.php:95 actions/emailsettings.php:163
+msgid "Send me email when someone sends me a private message."
+msgstr ""
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr "%s öffentliche Zeitleiste"
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
+#: actions/twitapifavorites.php:118
+msgid "This notice is already a favorite!"
+msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr "%s Status"
+#: 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/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr "%s Zeitleiste"
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
-msgid "%s updates from everyone!"
+msgid "%s favorite notices"
 msgstr ""
 
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#, php-format
+msgid "Feed of favorite notices of %s"
 msgstr ""
-"(Sie sollten in Kürze eine E-Mail mit der Anleitung zur Überprüfung Ihrer "
-"Mailadresse erhalten.)"
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
 msgstr ""
-"1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. "
-"Pflicht."
 
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-msgstr "6 oder mehr Buchstaben. Pflicht."
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %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/inbox.php:53 actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
-"Ein Bestätigungscode wurde an die angegebene E-Mail Adresse geschickt. "
-"Überprüfen Sie Ihren Posteingang (auch den Spamordner!) für den Code und "
-"Anweisungen, wie dieser benutzt wird."
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#: actions/invite.php:178 actions/invite.php:213
+#, 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."
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
 msgstr ""
-"Ein Bestätigungscode wurde an die von Ihnen angegebene Telefonnummer "
-"gesandt. Überprüfen Sie bitte Ihren Posteingang (auch den Spamordner!) auf "
-"den Code und die Anweisungen, um ihn zu benutzen."
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
-msgstr "API-Methode nicht gefunden!"
+#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
+#: actions/register.php:416
+msgid "Automatically login in the future; "
+msgstr ""
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
-msgstr "API-Methode im Aufbau."
+#: actions/login.php:122 actions/login.php:264
+msgid "For security reasons, please re-enter your "
+msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
+#: actions/login.php:126 actions/login.php:268
+msgid "Login with your username and password. "
 msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
+#: 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/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."
+msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+#: 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 ""
-"Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für "
-"Nicht-Menschen)"
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
 msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr "Warte auf die Bestätigung dieser Telefonnummer."
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+msgid "No such user"
+msgstr "Kein solcher Benutzer"
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr "Die Nachricht konnte nicht gelöscht werden."
+#: actions/newmessage.php:117 actions/newmessage.php:67
+msgid "New message"
+msgstr "Neue Nachricht"
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
+msgid "Notice without matching profile"
 msgstr ""
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
+#: actions/openidsettings.php:28 actions/openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr "Ändern der Profileinstellungen"
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr "Bestätigungscode"
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
+msgstr ""
 
-#: ../actions/register.php:202
+#: actions/outbox.php:28 actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %s - page %d"
+msgstr "Nachrichtenausgang von %s - Seite %d"
+
+#: actions/outbox.php:30 actions/outbox.php:61
+#, fuzzy, php-format
+msgid "Outbox for %s"
+msgstr "Nachrichtenausgang von %s"
+
+#: actions/outbox.php:53 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 ""
-"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."
+"Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
+msgid "You can update your personal profile info here "
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
+#: 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 ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+msgid "This confirmation code is too old. "
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr "Konnte keine Statusmeldungen finden."
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
+msgstr "Dein Spitzname auf diesem Server, "
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
+msgstr "Anweisungen für die Passwort-Widerherstellung "
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr "Neues Passwort erfolgreich gespeichert."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/register.php:95 actions/register.php:180
+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 ""
+"Gratulier, %s! Und willkommen auf %%%%site.name%%%%. Jetzt möchtest du "
+"vielleicht..."
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr "Sende eine Nachricht"
+
+#: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
-msgid "Feed for tag %s"
-msgstr ""
+msgid "Mobile carrier for your phone. "
+msgstr "Mobilfunkanbieter deines Telefons. "
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Direkte Nachricht an %s"
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Alle an %s gesendeten direkten Nachrichten"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+msgid "Direct Messages You've Sent"
+msgstr "Von dir gesendete direkte Nachrichten"
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Alle von %s gesendeten direkten Nachrichten"
 
-#: ../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/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
+msgid "No message text!"
+msgstr "Fehlender Nachrichten Text!"
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
+msgid "Recipient user not found."
+msgstr "Empfänger nicht gefunden."
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
+#: 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/invite.php:55 actions/invite.php:62
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #, php-format
-msgid "Invalid email address: %s"
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#, php-format
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-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 hat deine Nachricht als Favorit gespeichert"
 
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
+#: 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 ""
 
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr "Sprache"
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+msgid "Twitter settings"
+msgstr "Twitter Einstellungen"
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
+msgstr "Twitter Account"
 
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+msgid "Current verified Twitter account."
+msgstr "Momentan bestätigter Twitter Account."
 
-#: ../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/twittersettings.php:63
+msgid "Twitter Username"
+msgstr "Twitter Benutzername"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
+msgstr "Keine Leerzeichen bitte."
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr "Twitter Passwort"
+
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+msgid "Automatically send my notices to Twitter."
+msgstr "Sende meine Nachrichten automatisch zu Twitter."
+
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: ../actions/smssettings.php:304
-#, php-format
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+msgid "Subscribe to my Twitter friends here."
+msgstr "Abonniere meine Twitter Freunde hier."
+
+#: actions/twittersettings.php:122
 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."
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
+#: actions/twittersettings.php:137
 #, php-format
-msgid "New email address for posting to %s"
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-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 "Konnte Twitter Einstellungen nicht speichern!"
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+msgid "Twitter settings saved."
+msgstr "Twitter Einstellungen gespeichert."
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
+#: actions/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."
+msgstr "Das ist nicht dein Twitter Account."
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr "Kein Code eingegeben"
+#: 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/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
+msgstr "Twitter Account entfernt."
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-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 "Konnte Twitter Einstellungen nicht speichern."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+msgid "Twitter preferences saved."
+msgstr "Twitter Einstellungen gespeichert."
+
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
+msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
+msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+msgid "Command results"
 msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
 msgstr ""
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
+#: classes/Command.php:96 classes/Command.php:113
+#, 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 ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
+#: classes/Command.php:146 classes/Command.php:166
+msgid "Notice marked as fave."
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
+#: classes/Command.php:166 classes/Command.php:189
 #, php-format
-msgid "Notices tagged with %s"
-msgstr ""
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
 
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
+msgstr "Vollständiger Name: %s"
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
+#: classes/Command.php:172 classes/Command.php:195
+#, fuzzy, php-format
+msgid "Location: %s"
+msgstr "Standort: %s"
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
+#: classes/Command.php:175 classes/Command.php:198
+#, php-format
+msgid "Homepage: %s"
+msgstr "Homepage: %s"
 
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
+msgstr "Ãœber: %s"
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
+#: 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/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Direkte Nachricht an %s abgeschickt"
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
+msgstr "Fehler beim Senden der Nachricht"
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
+#: 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"
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"
+msgstr "%s abonniert"
 
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
+#: classes/Command.php:295 classes/Command.php:335
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
+#: classes/Command.php:376
+msgid "Command not yet implemented."
+msgstr "Kommando noch nicht implementiert."
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
+#: classes/Command.php:313 classes/Command.php:356
+msgid "Notification off."
+msgstr "Benachrichtigungen deaktiviert."
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
+msgstr "Konnte Benachrichtigungen nicht deaktivieren."
 
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
+msgstr "Benachrichtigungen aktiviert."
 
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
+msgstr "Konnte Benachrichtigungen nicht aktivieren."
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-msgstr ""
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
+msgstr "Kommandos:\n"
 
-#: ../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 ""
+#: classes/Message.php:53 classes/Message.php:56
+msgid "Could not insert message."
+msgstr "Konnte Nachricht nicht einfügen."
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
+#: classes/Message.php:63 classes/Message.php:66
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: lib/gallery.php:46
+#, fuzzy
+msgid "User without matching profile in system."
+msgstr "Benutzer ohne zutreffendes Profil im System."
+
+#: lib/mail.php:147 lib/mail.php:289
+#, fuzzy, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
+"Du hast eine neue Posting Addresse auf %1$s.\n"
+"\n"
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
+msgstr "Neue private Nachricht von %s"
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: lib/mail.php:253 lib/mail.php:512
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 msgstr ""
+"%s$s (%2$s) hat dir einen private Nachricht geschickt:\n"
+"\n"
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
+#: 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"
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
+#: lib/openid.php:195 lib/openid.php:203
+msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+msgid "Favorites"
+msgstr "Favoriten"
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
+msgstr "%s's favorisierte Nachrichten"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
+msgstr "Benutzer"
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
+msgstr "Posteingang"
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
+msgstr "Deine eingehenden Nachrichten"
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
+msgstr "Postausgang"
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
+msgstr "Deine gesendeten Nachrichten"
+
+#: 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 Integrations Optionen"
+
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
+msgstr "An"
+
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Konnte Nachricht nicht parsen."
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s und Freunde"
+
+#: actions/avatarsettings.php:76
+msgid "You can upload your personal avatar."
 msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Twitter Einstellungen"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: 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 Session Token. Bitte versuche es erneut."
+
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
+#: actions/avatarsettings.php:334 actions/grouplogo.php:391
+#: classes/User_group.php:112
+#, fuzzy
+msgid "Lost our file."
+msgstr "Blocken des Benutzer fehlgeschlagen."
+
+#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
+#: actions/grouplogo.php:406 actions/grouplogo.php:440
+#: classes/User_group.php:129 classes/User_group.php:161
+#, fuzzy
+msgid "Unknown file type"
+msgstr "Nicht unterstützer Datei Typ"
+
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Kein Profile spezifiziert."
+
+#: 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/block.php:111
+msgid "Block user"
+msgstr "Blocke Benutzer"
+
+#: actions/block.php:129
+msgid "Are you sure you want to block this user? "
+msgstr "Bist du sicher das du diesen Benutzer blocken möchtest?"
+
+#: actions/block.php:162
+msgid "You have already blocked this user."
+msgstr "Du hast diesen Benutzer bereits geblockt."
+
+#: actions/block.php:167
+msgid "Failed to save block information."
+msgstr "Konnte Block Daten nicht speichern."
+
+#: actions/confirmaddress.php:159
+#, fuzzy, php-format
+msgid "The address \"%s\" has been "
+msgstr "Die Adresse wurde entfernt."
+
+#: actions/deletenotice.php:73
+#, fuzzy
+msgid "You are about to permanently delete a notice. "
+msgstr "Sind Sie sicher, dass sie diese Nachricht löschen wollen?"
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Zu Favoriten hinzufügen"
+
+#: actions/editgroup.php:54
+#, php-format
+msgid "Edit %s group"
+msgstr "Gruppe %s bearbeiten"
+
+#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
+#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+msgid "You must be logged in to create a group."
+msgstr "Sie müssen eingeloggt sein, um eine Gruppe zu erzeugen."
+
+#: actions/editgroup.php:87 actions/grouplogo.php:87
+#: actions/groupmembers.php:76 actions/joingroup.php:81
+#: actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "Kein Nutzername."
+
+#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
+#: actions/groupmembers.php:83 actions/joingroup.php:88
+#: actions/showgroup.php:128
+#, fuzzy
+msgid "No such group"
+msgstr "Kein solcher Benutzer"
+
+#: 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:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
 msgstr ""
+"Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. "
+"Leerzeichen sind nicht erlaubt."
 
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr "Unbekannter Befehl"
+#: actions/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "Die Biografie ist zu lang (max. 140 Zeichen)"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Konnte Benutzerdaten nicht aktualisieren."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "Einstellungen gespeichert."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Warte auf die Bestätigung dieser Telefonnummer."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#, fuzzy
+msgid "Make a new email address for posting to; "
+msgstr "Neue E-Mail Adresse um auf %s zu schreiben"
+
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
+#: 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."
+
+#: actions/emailsettings.php:321
+#, fuzzy
+msgid "That email address already belongs "
+msgstr "Diese E-Mail Adresse gehört einem anderen Nutzer."
+
+#: actions/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
 msgstr ""
+"Ein Bestätigungscode wurde an die IM Adresse geschickt, die du hinzugefügt "
+"hast. Du musst zulassen, dass %s dir Nachrichten schicken darf."
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/facebookhome.php:110
+msgid "Server error - couldn't get user!"
+msgstr "Serverfehler - User nicht gefunden!"
+
+#: actions/facebookhome.php:196
 #, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+msgid "If you would like the %s app to automatically update "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, php-format
-msgid "Updates from %1$s on %2$s!"
+msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
+#: actions/facebookhome.php:218
+msgid "Skip"
+msgstr "Ãœberspringen"
 
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
+#: actions/facebookhome.php:235
+#, fuzzy
+msgid "No notice content!"
+msgstr "Kein Inhalt!"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+msgid "Pagination"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr "In welcher Zeitzone befinden Sie sich üblicherweise?"
+#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#, fuzzy
+msgid "After"
+msgstr "« Später"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-msgstr ""
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#, fuzzy
+msgid "Before"
+msgstr "Früher »"
 
-#: ../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/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
+#: actions/facebookinvite.php:72
+#, fuzzy
+msgid "Invitations have been sent to the following users:"
+msgstr "Einladung(en) an folgende Personen geschickt:"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
+#: actions/facebookinvite.php:96
+#, fuzzy, php-format
+msgid "You have been invited to %s"
+msgstr "Du wurdest von %s angestupst"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "Feed der Freunde von %s"
+
+#: actions/facebookinvite.php:113
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "Friends already using %s:"
 msgstr ""
 
-#: ../lib/mail.php:147
+#: actions/facebookinvite.php:130
 #, 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 "Send invitations"
+msgstr "Einladungen senden"
+
+#: 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 mit deinem Session Token. Bitte versuche es erneut."
+
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Einstellungen gesichert."
+
+#: actions/facebooksettings.php:90
+#, fuzzy
+msgid "Automatically update my Facebook status with my notices."
+msgstr "Sende meine Nachrichten automatisch zu Twitter."
+
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Profil"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
+#: actions/facebooksettings.php:124
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "If you would like %s to automatically update "
 msgstr ""
 
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Einstellungen"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
-msgstr ""
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+#, fuzzy
+msgid "Popular notices"
+msgstr "Unbekannte Nachricht."
 
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Unbekannte Nachricht."
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
 msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Favor"
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
-msgstr ""
+#: actions/finishremotesubscribe.php:188
+#, fuzzy
+msgid "That user has blocked you from subscribing."
+msgstr "Dieser Benutzer erlaubt dir nicht zu abbonieren."
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
+#: actions/groupbyid.php:79
+msgid "No ID"
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
-msgstr ""
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+msgid "Group logo"
+msgstr "Gruppen-Logo"
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr ""
+#: 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/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Avatar aktualisiert."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Aktualisierung des Avatars fehlgeschlagen"
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
-msgid "%s favorite notices"
-msgstr ""
+msgid "%s group members"
+msgstr "%s Gruppen-Mitglieder"
 
-#: actions/favoritesrss.php:64
+#: actions/groupmembers.php:96
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid "%s group members, page %d"
 msgstr ""
 
-#: actions/inbox.php:28
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "Liste der Benutzer in dieser Gruppe"
+
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
+msgstr "Gruppen"
+
+#: actions/groups.php:64
 #, php-format
-msgid "Inbox for %s - page %d"
-msgstr ""
+msgid "Groups, page %d"
+msgstr "Gruppen, Seite %d"
 
-#: actions/inbox.php:30
+#: actions/groups.php:90
 #, php-format
-msgid "Inbox for %s"
+msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#, fuzzy
+msgid "Create a new group"
+msgstr "Neues Konto anlegen"
 
-#: actions/invite.php:178
-#, php-format
+# Suche nach "Nutzern" stimmt ja nicht, es ist die Gruppensuche.
+#: actions/groupsearch.php:57
+#, fuzzy, php-format
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
+"Suche nach Gruppen auf %%site.name%%, nach Name, Ort oder Beschreibung der "
+"Gruppe. Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss "
+"aus mindestens 3 Zeichen bestehen."
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
-msgstr ""
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "Suche nach Gruppen"
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
 msgstr ""
 
-#: actions/login.php:126
-msgid "Login with your username and password. "
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
-msgstr ""
+#: actions/imsettings.php:147
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk "
+msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
 
-#: actions/newmessage.php:65
-msgid "No recipient specified."
-msgstr ""
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Kein Bestätigungs-Code."
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
-msgstr ""
+#: actions/joingroup.php:65
+msgid "You must be logged in to join a group."
+msgstr "Du mußt eingeloggt sein, um Mitglied einer Gruppe zu werden."
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
-msgstr ""
+#: actions/joingroup.php:95
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Du hast diese Benutzer bereits abonniert:"
 
-#: actions/newmessage.php:108
-msgid "No such user"
-msgstr ""
+#: actions/joingroup.php:128
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Kann Nutzer %s nicht folgen: Nutzer nicht gefunden"
 
-#: actions/newmessage.php:117
-msgid "New message"
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
 msgstr ""
 
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/openidsettings.php:28
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
+#: actions/leavegroup.php:65
+msgid "You must be logged in to leave a group."
+msgstr "Du mußt eingeloggt sein, um aus einer Gruppe auszutreten."
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
-msgstr ""
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "Tag nicht vorhanden."
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Dieses Profil hast du uns nicht geschickt"
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
+#: actions/leavegroup.php:100
+msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/outbox.php:28
+#: actions/leavegroup.php:130
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "Konnte Nutzereintrag nicht schreiben"
+
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Kann Nutzer %s nicht folgen: Nutzer nicht gefunden"
+
+#: actions/leavegroup.php:145
 #, php-format
-msgid "Outbox for %s - page %d"
+msgid "%s left group %s"
 msgstr ""
 
-#: actions/outbox.php:30
-#, php-format
-msgid "Outbox for %s"
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
 msgstr ""
 
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Kein aktueller Status"
+
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Neue Gruppe"
+
+#: actions/newgroup.php:115
+#, fuzzy
+msgid "Use this form to create a new group."
+msgstr "Hier kannst du einen neuen Account erstellen. "
+
+#: actions/newgroup.php:177
+#, fuzzy
+msgid "Could not create group."
+msgstr "Konnte Tags nicht speichern."
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Konnte Abonnement nicht erstellen."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "Diese Datei ist zu groß."
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/peoplesearch.php:28
-#, php-format
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "Nachrichten"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
+msgstr "Ajax Fehler"
+
+#: actions/nudge.php:85
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
-msgstr ""
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Stups abgeschickt"
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
-msgstr ""
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Stups gesendet!"
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
-msgstr ""
+#: actions/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "OpenID Anmeldung"
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
-msgstr ""
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Entferne OpenID"
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
-msgstr ""
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Einstellungen"
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
-msgstr ""
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr "URL Auto-Kürzung"
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
-msgstr ""
+#: actions/othersettings.php:112
+msgid "Service"
+msgstr "Dienst"
 
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
-msgstr ""
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr "URL Auto-Kürzungs Dienst."
 
-#: actions/register.php:216
+#: actions/othersettings.php:144
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "URL Aut-Kürzungs Dienst ist zu lange (max. 50 Zeichen)"
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Ändere dein Passwort"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "Passwort gespeichert."
+
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Ungültiger Tag: %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/peopletag.php:91
 #, 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 "Profil unbekannt"
+
+#: actions/profilesettings.php:124
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
+"Tags über dich selbst (Buchstaben, Zahlen, -, ., und _) durch Kommas oder "
+"Leerzeichen getrennt"
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/profilesettings.php:144
+#, fuzzy
+msgid "Automatically subscribe to whoever "
 msgstr ""
+"Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
+"Menschen)"
 
-#: actions/remotesubscribe.php:51
+#: actions/profilesettings.php:229 actions/tagother.php:176
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+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"
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
+msgstr "Konnte öffentlichen Stream nicht abrufen"
+
+#: actions/public.php:220
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
+"Dies ist %%site.name%%, ein [mikro-blogging] (http://de.wikipedia.org/wiki/"
+"Mikro-blogging) Dienst "
+
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Feed des öffentlichen Streams"
 
-#: actions/showfavorites.php:61
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Feed for favorites of %s"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/showmessage.php:33
-msgid "No such message."
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."
+msgstr "Sorry, zum registrieren benötigst du eine Einladung."
+
+#: actions/register.php:149
+#, fuzzy
+msgid "You can't register if you don't "
 msgstr ""
+"Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/register.php:286
+#, fuzzy
+msgid "With this form you can create "
+msgstr "Hier kannst du einen neuen Account erstellen. "
+
+#: actions/register.php:368
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, "
+msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
+
+#: actions/register.php:382 actions/register.php:386
+#, fuzzy
+msgid "Used only for updates, announcements, "
 msgstr ""
+"Wird nur für Updates, wichtige Mitteilungen und zur "
+"Passwortwiederherstellung verwendet"
 
-#: actions/showmessage.php:61
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: actions/register.php:398
+#, fuzzy
+msgid "URL of your homepage, blog, "
 msgstr ""
+"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
 
-#: actions/showmessage.php:66
-#, php-format
-msgid "Message from %1$s on %2$s"
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Beschreibe dich selbst in 140 Zeichen"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "Wo du bist, z.B. \"Stadt, Gebiet, Land\""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
 msgstr ""
+"außer folgende private Daten: Passwort, E-Mail, Adresse, IM Adresse, "
+"Telefonnummer."
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/register.php:471
+#, fuzzy, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr ""
+"Gratulier, %s! Und willkommen auf %%%%site.name%%%%. Jetzt möchtest du "
+"vielleicht..."
 
-#: actions/smssettings.php:312
-#, php-format
-msgid "Mobile carrier for your phone. "
+#: actions/register.php:495
+msgid "(You should receive a message by email "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
-#, php-format
-msgid "Direct messages to %s"
+#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
+msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/replies.php:118
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Antworten an %s"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s favorite notices, page %d"
+msgstr "%s's favorisierte Nachrichten"
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
-msgid "All the direct messages sent to %s"
-msgstr ""
+msgid "%s group"
+msgstr "%s Gruppe"
 
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
-#, php-format
-msgid "All the direct messages sent from %s"
+#: actions/showgroup.php:206
+#, fuzzy
+msgid "Group profile"
+msgstr "Unbekanntes Benutzer Profil."
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#, fuzzy
+msgid "Note"
+msgstr "Nachrichten"
+
+#: actions/showgroup.php:270
+#, fuzzy
+msgid "Group actions"
+msgstr "Andere Optionen"
+
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Feed der Nachrichten von %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
+msgid "Members"
+msgstr "Mitglied seit"
+
+#: 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/twitapidirect_messages.php:138
-msgid "Recipient user not found."
+#: actions/showgroup.php:370
+msgid "All members"
+msgstr "Alle Mitglieder"
+
+#: actions/showgroup.php:378
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
+"Dies ist %%site.name%%, ein [mikro-blogging] (http://de.wikipedia.org/wiki/"
+"Mikro-blogging) Dienst "
 
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/showstream.php:73
 #, php-format
-msgid "%s / Favorites from %s"
+msgid "%s, page %d"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
-#, php-format
-msgid "%s updates favorited by %s / %s."
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Profil"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "Benutzer hat kein Profil."
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr "Foto"
+
+#: actions/showstream.php:317
+#, fuzzy
+msgid "User actions"
+msgstr "Andere Optionen"
+
+#: actions/showstream.php:342
+#, fuzzy
+msgid "Send a direct message to this user"
+msgstr "Direkte Nachricht an %s abgeschickt"
+
+#: actions/showstream.php:343
+#, fuzzy
+msgid "Message"
+msgstr "Neue Nachricht"
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Abonnenten"
+
+#: actions/showstream.php:533
+msgid "All groups"
+msgstr "Alle Gruppen"
+
+#: actions/showstream.php:542
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
+"Dies ist %%site.name%%, ein [mikro-blogging] (http://de.wikipedia.org/wiki/"
+"Mikro-blogging) Dienst "
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/smssettings.php:128
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, "
+msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
+
+#: actions/smssettings.php:162
+#, fuzzy
+msgid "Send me notices through SMS; "
+msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
+
+#: actions/smssettings.php:335
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. "
+msgstr "Warte auf die Bestätigung dieser Telefonnummer."
+
+#: actions/smssettings.php:453
+#, fuzzy
+msgid "Mobile carrier"
+msgstr "Wähle einen Netzanbieter"
+
+#: actions/subedit.php:70
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Dieses Profil hast du uns nicht geschickt"
+
+#: 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 "Unbekannter Benutzer."
+
+#: actions/subscribe.php:69
+msgid "Subscribed"
+msgstr "Abonniert"
+
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Abonnenten"
+
+#: actions/subscribers.php:52
 #, php-format
-msgid "%s added your notice as a favorite"
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/subscribers.php:63
+#, fuzzy
+msgid "These are the people who listen to "
+msgstr "Dies sind die Leute, die %ss Nachrichten lesen."
+
+#: actions/subscribers.php:67
+#, fuzzy, php-format
+msgid "These are the people who "
+msgstr "Dies sind die Leute, die %ss Nachrichten lesen."
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Alle Abonnements"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Alle Abonnements"
+
+#: actions/subscriptions.php:65
+#, fuzzy
+msgid "These are the people whose notices "
+msgstr "Dies sind die Leute, deren Nachrichten %s liest."
+
+#: actions/subscriptions.php:69
+#, fuzzy, php-format
+msgid "These are the people whose "
+msgstr "Dies sind die Leute, die %ss Nachrichten lesen."
+
+#: actions/subscriptions.php:122
+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"
+
+#: actions/tag.php:66
 #, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/tagother.php:33
+#, fuzzy
+msgid "Not logged in"
+msgstr "Nicht eingeloggt."
+
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No id argument."
+msgstr "Kein id Argument."
+
+#: actions/tagother.php:65
+#, fuzzy, php-format
+msgid "Tag %s"
+msgstr "Tags"
+
+#: actions/tagother.php:141
+#, fuzzy
+msgid "Tag user"
+msgstr "Tags"
+
+#: actions/tagother.php:149
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
+"Tags für diesen Benutzer (Buchstaben, Nummer, -, ., und _), durch Komma oder "
+"Leerzeichen getrennt"
 
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
-msgstr ""
+#: actions/tagother.php:164
+#, fuzzy
+msgid "There was a problem with your session token."
+msgstr "Es gab ein Problem mit deinem Session Token. Bitte versuche es erneut."
 
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
-msgstr ""
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr "Du kannst nur Benutzer taggen die du abonniert hast."
 
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
-msgstr ""
+#: actions/tagother.php:198
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Konnte Tags nicht speichern."
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/tagother.php:233
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
-msgstr ""
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "Tag nicht vorhanden."
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr ""
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Microblog getagged mit %s"
 
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
-msgstr ""
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr "Blocken des Benutzer fehlgeschlagen."
 
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "Keine Anfrage gefunden!"
 
-#: actions/twittersettings.php:122
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
+msgstr "Twitter Benutzername"
+
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Neues Passwort"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
+msgstr "Twitter Freunde"
+
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/twittersettings.php:341
+#, fuzzy, php-format
+msgid "Unable to retrieve account information "
+msgstr "Konnte Block Daten nicht speichern."
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Fehler beim Speichern des Nutzers."
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Der entfernte Server hat keine Profil-URL geliefert."
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Entferntes Profil ohne ein passendes Profil"
+
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Abbestellen"
+
+#: actions/usergroups.php:63
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
+msgid "%s groups"
+msgstr "%s Gruppen"
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
-msgstr ""
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
+msgstr "%s Gruppen, Seite %d"
 
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
-msgstr ""
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Problem bei Speichern der Nachricht."
 
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
-msgstr ""
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Aktualisierung des Avatars fehlgeschlagen"
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
-msgstr ""
+#: lib/accountsettingsaction.php:119
+#, fuzzy
+msgid "Other"
+msgstr "Anderes"
 
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
-msgstr ""
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr "Andere Optionen"
 
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
-msgstr ""
+#: lib/action.php:130
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
 
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: lib/action.php:145
+msgid "Untitled page"
 msgstr ""
 
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: lib/action.php:316
+msgid "Primary site navigation"
 msgstr ""
 
-#: classes/Channel.php:113
-msgid "Command results"
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: classes/Channel.php:148
-msgid "Command complete"
+#: lib/action.php:325
+msgid "Search for people or text"
 msgstr ""
 
-#: classes/Channel.php:158
-msgid "Command failed"
-msgstr ""
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "Ãœber"
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
+#: lib/action.php:328
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "Ändere dein Passwort"
 
-#: classes/Command.php:96
-#, php-format
-msgid "Subscriptions: %1$s\n"
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
-msgstr ""
+#: lib/action.php:332
+msgid "Logout from the site"
+msgstr "Ausloggen"
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
-msgstr ""
+#: lib/action.php:335
+msgid "Login to the site"
+msgstr "Einloggen"
 
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr ""
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Neues Konto anlegen"
 
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "Diese OpenID ist nicht bekannt."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Hilfe"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "Neue Nachricht"
+
+#: lib/action.php:417
+msgid "Local views"
 msgstr ""
 
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "Neue Nachricht"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Abonnements"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
 msgstr ""
 
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
+#: lib/action.php:630
+#, fuzzy
+msgid "All "
+msgstr "Alle"
+
+#: lib/action.php:635
+msgid "license."
 msgstr ""
 
-#: classes/Command.php:178
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Blocke Benutzer"
+
+#: lib/blockform.php:153
+msgid "Block"
+msgstr "Blockieren"
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "%s's favorisierte Nachrichten"
+
+#: lib/facebookaction.php:268
 #, php-format
-msgid "About: %s"
+msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: classes/Command.php:200
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+#: lib/facebookaction.php:271
+#, fuzzy
+msgid " a new account."
+msgstr "Neues Konto anlegen"
+
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#, fuzzy
+msgid "Published"
+msgstr "Öffentlich"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
+msgid "Favor this notice"
+msgstr "%s's favorisierte Nachrichten"
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Daten exportieren"
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr "Tags filtern"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr "Alle"
+
+#: lib/galleryaction.php:137
+msgid "Tag"
+msgstr "Tag"
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: classes/Command.php:214
-#, php-format
-msgid "Direct message to %s sent"
+#: lib/galleryaction.php:139
+msgid "Go"
 msgstr ""
 
-#: classes/Command.php:216
-msgid "Error sending direct message."
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
+"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
 
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Abonnements"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Beschreibe dich selbst in 140 Zeichen"
+
+#: lib/groupeditform.php:158
+#, fuzzy
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr "Wo du bist, z.B. \"Stadt, Gebiet, Land\""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr "Gruppe"
+
+#: lib/groupnav.php:100
+msgid "Admin"
 msgstr ""
 
-#: classes/Command.php:270
+#: lib/groupnav.php:101
 #, php-format
-msgid "Subscribed to %s"
+msgid "Edit %s group properties"
 msgstr ""
 
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Abmelden"
 
-#: classes/Command.php:295
+#: lib/groupnav.php:107
 #, php-format
-msgid "Unsubscribed from %s"
+msgid "Add or edit %s logo"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
-msgstr ""
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
+msgstr "Gruppen mit den meisten Mitgliedern"
 
-#: classes/Command.php:313
-msgid "Notification off."
-msgstr ""
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr "Gruppen mit den meisten Beiträgen"
 
-#: classes/Command.php:315
-msgid "Can't turn off notification."
+#: lib/grouptagcloudsection.php:56
+#, php-format
+msgid "Tags in %s group's notices"
 msgstr ""
 
-#: classes/Command.php:333
-msgid "Notification on."
-msgstr ""
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Dies Seite liegt in keinem von dir akzeptierten Mediatype vor."
 
-#: classes/Command.php:335
-msgid "Can't turn on notification."
-msgstr ""
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Einloggen"
 
-#: classes/Command.php:344
-msgid "Commands:\n"
-msgstr ""
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Speichern"
 
-#: classes/Message.php:53
-msgid "Could not insert message."
-msgstr ""
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Benutzername oder Passwort falsch."
 
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
-msgstr ""
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Neues Konto anlegen"
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr ""
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr "Einloggen oder registrieren mit OpenID"
 
-#: lib/mail.php:147
+#: lib/mail.php:175
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
+"Hey, %s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
-msgstr ""
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s hat deine Nachrichten auf %2$s abonniert."
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Standort: %s"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Homepage: %s"
 
-#: lib/mail.php:253
+#: lib/mail.php:258
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
+"Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
-msgstr ""
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr "Du wurdest von %s angestupst"
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
+#: lib/mail.php:465
+#, fuzzy, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr ""
+"%s$s (%2$s) hat dir einen private Nachricht geschickt:\n"
+"\n"
 
-#: lib/personal.php:65
-msgid "Favorites"
-msgstr ""
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s hat deine Nachrichten auf %2$s abonniert."
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+#, fuzzy
+msgid "From"
+msgstr "von"
+
+#: lib/messageform.php:110
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Notiz löschen"
+
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "Sende einen Stupser"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 oder mehr Zeichen"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "als Antwort auf... "
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Die Nachricht konnte nicht gelöscht werden."
+
+#: lib/noticelist.php:451
+#, 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 "Notiz löschen"
+
+#: lib/nudgeform.php:116
+#, fuzzy
+msgid "Nudge this user"
+msgstr "Stups abgeschickt"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Nudge"
+msgstr "Stups abgeschickt"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "Sende einen Stupser"
 
-#: lib/personal.php:66
+#: lib/personaltagcloudsection.php:56
 #, php-format
-msgid "%s's favorite notices"
+msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/personal.php:66
-msgid "User"
+#: lib/profilelist.php:182
+msgid "(none)"
 msgstr ""
 
-#: lib/personal.php:75
-msgid "Inbox"
-msgstr ""
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Öffentlich"
 
-#: lib/personal.php:76
-msgid "Your incoming messages"
-msgstr ""
+#: lib/publicgroupnav.php:80
+#, fuzzy
+msgid "User groups"
+msgstr "Benutzer-Gruppen"
 
-#: lib/personal.php:80
-msgid "Outbox"
-msgstr ""
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
+msgstr "Kürzliche Tags"
 
-#: lib/personal.php:81
-msgid "Your sent messages"
+#: lib/publicgroupnav.php:86
+msgid "Featured"
 msgstr ""
 
-#: lib/settingsaction.php:99
-msgid "Twitter"
-msgstr ""
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "Suche nach anderen Nutzern"
 
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
+#: lib/searchgroupnav.php:82
+msgid "Notice"
+msgstr "Hinweis"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr "Finde Gruppen auf dieser Seite"
+
+#: lib/section.php:89
+msgid "Untitled section"
 msgstr ""
 
-#: lib/util.php:1718
-msgid "To"
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Entferntes Abonnement"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "%s abonniert"
+
+#: lib/subgroupnav.php:97
+#, php-format
+msgid "Groups %s is a member of"
 msgstr ""
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
+#: lib/subgroupnav.php:104
+#, fuzzy, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Lade deine Freunde und Kollegen ein diesen Dienst zu nutzen."
+
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Dieser Bemutzer hat Dich geblockt"
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "%s abonniert"
+
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+msgstr "Nein"
+
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr "Top-Poster"
+
+#: lib/unblockform.php:120 lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Entblocke Benutzer"
+
+#: lib/unblockform.php:150
+msgid "Unblock"
+msgstr "entblocken"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
 msgstr ""
+
+#~ msgid "Code not yet ready."
+#~ msgstr "Code noch nicht fertig."
+
+#~ msgid "Export and delete your user information."
+#~ msgstr "Exportiere und lösche deine Benutzer Daten."
+
+#~ msgid "Delete my account"
+#~ msgstr "Lösche meinen Account"
+
+#, fuzzy
+#~ msgid "Delete my account confirmation"
+#~ msgstr "Konnte E-Mailbestätigung nicht löschen."
+
+#, fuzzy
+#~ msgid "Check if you are sure you want to delete your account."
+#~ msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
+
+#~ msgid "Showing recently popular notices"
+#~ msgstr "Kürzlich populäre Nachrichten"
+
+#~ msgid "Tag a person"
+#~ msgstr "Tagge eine Person"
+
+#, fuzzy
+#~ msgid "List"
+#~ msgstr "Liste"
+
+#~ msgid "Icons"
+#~ msgstr "Icons"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "E-Mail konnte nicht bestätigt werden."
+
+#~ msgid "Email address"
+#~ msgstr "E-Mail Adresse "
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Fehler beim Einfügen der Nachricht"
+
+#~ 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."
diff --git a/locale/el/LC_MESSAGES/laconica.mo b/locale/el_GR/LC_MESSAGES/laconica.mo
index b40616592..071ea3bc5 100644
--- a/locale/el/LC_MESSAGES/laconica.mo
+++ b/locale/el_GR/LC_MESSAGES/laconica.mo
diff --git a/locale/el/LC_MESSAGES/laconica.po b/locale/el_GR/LC_MESSAGES/laconica.po
index 0171b419c..ccbeb34b9 100644
--- a/locale/el/LC_MESSAGES/laconica.po
+++ b/locale/el_GR/LC_MESSAGES/laconica.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\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"
@@ -17,15 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
 #, 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."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
@@ -34,11 +35,12 @@ 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 ""
 
-#: ../actions/invite.php:168 actions/invite.php:176
+#: ../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 ""
@@ -74,7 +76,7 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#: ../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 ""
@@ -91,22 +93,25 @@ msgid ""
 msgstr ""
 
 #: ../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 ""
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
+#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
 #, php-format
 msgid "%s Public Stream"
 msgstr "Δημόσια �οή %s"
@@ -114,26 +119,31 @@ 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"
 msgstr "%s και οι φίλοι του/της"
 
 #: ../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:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
 msgid "%s status"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -144,14 +154,14 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273
+#: ../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%%). "
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
 
-#: ../lib/util.php:259 lib/util.php:275
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
@@ -162,6 +172,8 @@ 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 ""
 
@@ -170,22 +182,25 @@ 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 "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 ""
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
@@ -210,7 +225,15 @@ msgstr ""
 #: 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/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 ""
 
@@ -228,15 +251,21 @@ msgstr ""
 #: 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/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 ""
 
-#: ../lib/util.php:324 lib/util.php:340
+#: ../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 "Αποδοχή"
 
@@ -244,38 +273,47 @@ msgstr "Αποδοχή"
 #: ../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/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 ""
 
 #: ../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: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 ""
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr ""
@@ -284,18 +322,22 @@ msgstr ""
 #: ../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: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 ""
 
@@ -306,16 +348,17 @@ msgstr ""
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34
+#: 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 ""
 
@@ -333,6 +376,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
+#: actions/smssettings.php:111
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
@@ -342,64 +386,77 @@ 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: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 ""
 
 #: ../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:121 lib/openid.php:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
 msgstr ""
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
 msgid "Cannot normalize that email address"
 msgstr ""
 
 #: ../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"
 msgstr ""
 
 #: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Αλλαγή κωδικο�"
 
-#: ../lib/settingsaction.php:94
+#: ../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 ""
 
@@ -407,24 +464,31 @@ msgstr ""
 #: ../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/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
 msgid "Confirmation code"
 msgstr ""
 
 #: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Ο κωδικός επιβεβαίωσης δεν β�έθηκε."
 
@@ -448,59 +512,66 @@ msgid ""
 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/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Επικοινωνία"
 
-#: ../lib/openid.php:178 lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
 #, 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."
 msgstr ""
 
-#: ../lib/openid.php:160 lib/openid.php:160
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
 #, php-format
 msgid "Could not redirect to server: %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 "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
 
-#: ../lib/subs.php:54 lib/subs.php:61
+#: ../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: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:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
@@ -508,43 +579,52 @@ msgstr ""
 #: ../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: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."
 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: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 ""
 
@@ -556,34 +636,46 @@ msgstr ""
 #: 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 ""
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+#: actions/emailsettings.php:99
 msgid "Current confirmed email address."
 msgstr ""
 
@@ -591,164 +683,186 @@ msgstr ""
 msgid "Currently"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
 #: ../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 ""
 
 #: ../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: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: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: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 ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
+#: ../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 "Εισάγετε ψευδώνυμο ή διε�θυνση email."
 
 #: ../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 ""
 
 #: ../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:153 actions/finishremotesubscribe.php:166
 msgid "Error inserting avatar"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
+#: 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: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: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: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/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: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/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/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: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:55 actions/tag.php:55 actions/tag.php:61
 #, 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 ""
 
@@ -757,55 +871,71 @@ 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/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/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 ""
 
 #: ../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."
@@ -825,18 +955,22 @@ 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 "Λάθος παλιός κωδικός"
 
-#: ../actions/login.php:67 actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
 msgid "Incorrect username or password."
 msgstr "Λάθος όνομα χ�ήστη ή κωδικός"
 
@@ -845,90 +979,103 @@ msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Οδηγίες για την ανάκτηση του κωδικο� σας "
-"έχουν σταλεί στην διε�θυνση email που έχετε καταχω�ίσει στον λογα�ιασμό σας."
+"Οδηγίες για την ανάκτηση του κωδικο� σας έχουν σταλεί στην διε�θυνση email "
+"που έχετε καταχω�ίσει στον λογα�ιασμό σας."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
 #, php-format
 msgid "Invalid email address: %s"
 msgstr ""
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr ""
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr ""
 
 #: ../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 ""
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr ""
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr ""
 
 #: ../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:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
 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: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: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/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:123 actions/invite.php:130 actions/invite.php:104
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, php-format
 msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: actions/imsettings.php:296
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
@@ -940,31 +1087,45 @@ msgid ""
 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)."
 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 "Συνδεθείτε με έναν λογα�ιασμό [OpenID](%%doc.openid%%)."
@@ -972,23 +1133,25 @@ msgstr "Συνδεθείτε με έναν λογα�ιασμό [OpenID](%%doc.o
 #: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
-"Συνδεθείτε με το όνομα χ�ήστη και τον "
-"κωδικό σας. Δεν έχετε όνομα χ�ήστη ακόμα; "
-"Κάντε [εγγ�αφή](%%action.register%%) για ένα νέο λογα�ιασμό ή δοκιμάστε το [OpenID](%%action.openidlogin%%). "
+"Συνδεθείτε με το όνομα χ�ήστη και τον κωδικό σας. Δεν έχετε όνομα χ�ήστη "
+"ακόμα; Κάντε [εγγ�αφή](%%action.register%%) για ένα νέο λογα�ιασμό ή "
+"δοκιμάστε το [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324
+#: ../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:110 actions/login.php:110 actions/login.php:245
+#: lib/facebookaction.php:320
 msgid "Lost or forgotten password?"
 msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;"
 
@@ -998,15 +1161,17 @@ 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%%."
 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:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr ""
@@ -1020,33 +1185,39 @@ 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 ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
+#: ../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: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 "�έος κωδικός"
 
@@ -1057,12 +1228,19 @@ 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 "Το ψευδώνυμο είναι ήδη σε χ�ήση. Δοκιμάστε κάποιο άλλο."
 
@@ -1070,131 +1248,160 @@ msgstr "Το ψευδώνυμο είναι ήδη σε χÏ�ήση. ΔοκιμάÏ
 #: ../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 "Ψευδώνυμο ή email"
 
 #: ../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 ""
 
 #: ../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/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: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/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
+#: 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/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: 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
 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/twitapistatuses.php:520 actions/twitapifavorites.php:112
+#: actions/twitapistatuses.php:446
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
 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: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: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 ""
 
@@ -1213,11 +1420,21 @@ msgstr ""
 #: 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
+#: 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 ""
 
@@ -1226,67 +1443,79 @@ 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: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 ""
 
-#: ../lib/openid.php:131 lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr ""
 
 #: ../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: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 ""
 
 #: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+#: actions/remotesubscribe.php:152
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:143
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:309
 msgid "Not found"
 msgstr ""
 
@@ -1297,144 +1526,175 @@ msgstr ""
 #: 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
+#: 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: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 ""
 
 #: ../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:81 actions/tag.php:41
 #, 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/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
+#: lib/logingroupnav.php:81
 msgid "OpenID"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73
 msgid "OpenID Account Setup"
 msgstr ""
 
-#: ../lib/openid.php:180 lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
 msgid "OpenID Login"
 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/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/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:133 lib/openid.php:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr ""
 
 #: ../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:135 actions/invite.php:143 actions/invite.php:180
 msgid "Optionally add a personal message to the invitation."
 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/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/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/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/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"
 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/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:133 actions/invite.php:141 actions/invite.php:178
 msgid "Personal message"
 msgstr ""
 
@@ -1450,66 +1710,79 @@ msgid ""
 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/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/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"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344
+#: ../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: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/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:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr ""
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1519,44 +1792,55 @@ 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/register.php:200 actions/register.php:214
+#: actions/register.php:67
 msgid "Registration successful"
 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/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414
 msgid "Remember me"
 msgstr ""
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr ""
 
@@ -1566,11 +1850,15 @@ msgstr ""
 #: 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/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/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr ""
 
@@ -1580,45 +1868,54 @@ msgid ""
 "remove it, add another OpenID first."
 msgstr ""
 
-#: ../lib/stream.php:55 lib/personal.php:55
+#: ../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 ""
 
 #: ../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 ""
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
 msgid "SMS Phone number"
 msgstr ""
 
 #: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
 msgid "SMS confirmation"
 msgstr ""
 
 #: ../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 ""
 
@@ -1626,20 +1923,27 @@ msgstr ""
 #: ../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/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/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 ""
 
 #: ../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 "
@@ -1654,24 +1958,29 @@ msgid ""
 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
+#: 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 ""
 
@@ -1685,11 +1994,12 @@ msgstr ""
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../lib/util.php:304 lib/util.php:320
+#: ../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 ""
 
@@ -1698,66 +2008,83 @@ 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 ""
 
 #: ../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/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 ""
 
 #: ../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
+#: 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 ""
 
@@ -1766,18 +2093,22 @@ 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 ""
 
 #: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr ""
 
 #: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
 msgstr ""
 
@@ -1786,52 +2117,64 @@ 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/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
 msgid "That is already your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
 msgid "That is already your phone number."
 msgstr ""
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr ""
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:62
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
@@ -1843,6 +2186,8 @@ 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 ""
 
@@ -1878,10 +2223,9 @@ msgstr ""
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
+#: ../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:"
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
 #: ../actions/recoverpassword.php:88
@@ -1895,6 +2239,7 @@ msgid ""
 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 "
@@ -1904,14 +2249,17 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
+#: 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/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 ""
 
@@ -1920,32 +2268,36 @@ 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/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php: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 ""
 
@@ -1953,20 +2305,24 @@ msgstr ""
 #: ../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/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
+#: ../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:60 actions/finishremotesubscribe.php:61
 msgid "Unknown version of OMB protocol."
 msgstr ""
 
@@ -1977,42 +2333,51 @@ msgid ""
 msgstr ""
 
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
 #: ../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 ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr ""
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
 msgid "Updates by instant messenger (IM)"
 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 ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
 #, 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 ""
 
@@ -2028,10 +2393,9 @@ msgstr ""
 msgid "Upload a new profile image"
 msgstr ""
 
-#: ../actions/invite.php:114 actions/invite.php:121
+#: ../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."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
@@ -2040,7 +2404,7 @@ msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
 msgid "User being listened to doesn't exist."
 msgstr ""
 
@@ -2054,10 +2418,16 @@ msgstr ""
 #: 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/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr ""
 
@@ -2066,35 +2436,42 @@ msgid "User not found."
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
 msgid "What timezone are you normally in?"
 msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %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\""
 msgstr ""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, 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
 msgid "Yes"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
+#: actions/finishaddopenid.php:112
 msgid "You already have this OpenID!"
 msgstr ""
 
@@ -2105,14 +2482,16 @@ msgid ""
 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:81 actions/invite.php:88 actions/invite.php:120
 msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2125,6 +2504,7 @@ msgid "You can create a new account to start posting notices."
 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 ""
@@ -2138,27 +2518,30 @@ 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."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: 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 ""
 
@@ -2176,15 +2559,16 @@ msgid ""
 msgstr ""
 
 #: ../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: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/invite.php:103 actions/invite.php:110
+#: ../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!"
@@ -2195,6 +2579,7 @@ 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 ""
 
@@ -2209,47 +2594,47 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992
+#: ../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:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002
+#: ../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: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: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: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:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr ""
 
@@ -2260,21 +2645,23 @@ 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/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/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 ""
 
@@ -2291,18 +2678,22 @@ msgstr ""
 #: 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:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr ""
 
-#: actions/disfavor.php:63
+#: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr ""
 
-#: actions/disfavor.php:72
+#: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
 msgstr ""
 
@@ -2310,16 +2701,18 @@ msgstr ""
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: actions/emailsettings.php:95
+#: 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: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
+#: classes/Command.php:132 actions/favor.php:86
+#: actions/twitapifavorites.php:125 classes/Command.php:152
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2328,86 +2721,91 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: actions/inbox.php:28
+#: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
 msgstr ""
 
-#: actions/inbox.php:30
+#: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 msgstr ""
 
-#: actions/inbox.php:53
+#: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: actions/invite.php:178
+#: 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/login.php:104
+#: 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:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: 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 ""
 
-#: actions/newmessage.php:65
+#: 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
+#: 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
+#: 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."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
 msgstr ""
 
-#: actions/openidsettings.php:28
+#: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: actions/openidsettings.php:46
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
@@ -2415,64 +2813,67 @@ msgstr ""
 msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: actions/openidsettings.php:87
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: actions/outbox.php:28
+#: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: actions/outbox.php:30
+#: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr ""
 
-#: actions/outbox.php:53
+#: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: actions/peoplesearch.php:28
+#: 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/profilesettings.php:27
+#: 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:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
 msgstr ""
 
-#: actions/recoverpassword.php:141
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: actions/recoverpassword.php:154
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
 msgstr ""
 
-#: actions/recoverpassword.php:169
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
 msgstr ""
 
-#: actions/recoverpassword.php:271
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
 msgstr ""
 
-#: actions/recoverpassword.php:327
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -2487,21 +2888,22 @@ msgstr ""
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: 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:61 actions/showfavorites.php:145
 #, php-format
 msgid "Feed for favorites of %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 ""
 
-#: actions/showmessage.php:33
+#: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
 msgstr ""
 
@@ -2509,12 +2911,12 @@ msgstr ""
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: actions/showmessage.php:61
+#: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: actions/showmessage.php:66
+#: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
@@ -2523,58 +2925,63 @@ msgstr ""
 msgid "Send a message"
 msgstr ""
 
-#: actions/smssettings.php:312
+#: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #, 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."
 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/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
 msgid "%s updates favorited by %s / %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 ""
 
 #: 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"
@@ -2586,15 +2993,15 @@ msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2602,7 +3009,7 @@ msgstr ""
 msgid "Twitter Username"
 msgstr ""
 
-#: actions/twittersettings.php:65
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgid "No spaces, please."
 msgstr ""
 
@@ -2610,15 +3017,15 @@ msgstr ""
 msgid "Twitter Password"
 msgstr ""
 
-#: actions/twittersettings.php:72
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: actions/twittersettings.php:75
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: actions/twittersettings.php:78
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
@@ -2628,7 +3035,7 @@ msgid ""
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -2638,160 +3045,166 @@ 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!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: 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: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:245 actions/twittersettings.php:461
 msgid "Twitter preferences saved."
 msgstr ""
 
-#: actions/userauthorization.php:84
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
 msgstr ""
 
-#: actions/userauthorization.php:324
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: actions/userauthorization.php:334
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:204
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:215
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39
+#: classes/Command.php:39 classes/Command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: classes/Command.php:96
+#: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: 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:146 classes/Command.php:166
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166
+#: classes/Command.php:166 classes/Command.php:189
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: classes/Command.php:169
+#: classes/Command.php:169 classes/Command.php:192
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
-#: classes/Command.php:172
+#: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
-#: classes/Command.php:175
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178
+#: classes/Command.php:178 classes/Command.php:201
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:228
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:300
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:307
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: 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:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: 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:313 classes/Command.php:356
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:358
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:379
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:381
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53
+#: classes/Message.php:53 classes/Message.php:56
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63
+#: classes/Message.php:63 classes/Message.php:66
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -2799,74 +3212,1491 @@ msgstr ""
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:289
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:508
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:512
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43
+#: 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:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: lib/personal.php:65
+#: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
 msgstr ""
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
 msgstr ""
 
-#: lib/personal.php:75
+#: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
 msgstr ""
 
-#: lib/personal.php:76
+#: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
 msgstr ""
 
-#: lib/personal.php:80
+#: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
 msgstr ""
 
-#: lib/personal.php:81
+#: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgid "To"
 msgstr ""
 
-#: scripts/maildaemon.php:45
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "Could not parse message."
 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."
+msgstr ""
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Ρυθμίσεις OpenID"
+
+#: 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
+#, 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
+#, php-format
+msgid "The address \"%s\" has been "
+msgstr ""
+
+#: actions/deletenotice.php:73
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
+#, 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"
+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
+#, 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"
+msgstr ""
+
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
+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/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: actions/editgroup.php:226
+msgid "Options saved."
+msgstr ""
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr ""
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
+msgstr ""
+
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
+msgstr ""
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+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. "
+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 ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, php-format
+msgid "Allow %s to update my Facebook status"
+msgstr ""
+
+#: actions/facebookhome.php:218
+msgid "Skip"
+msgstr ""
+
+#: actions/facebookhome.php:235
+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 ""
+
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
+msgstr ""
+
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
+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:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, 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
+#, fuzzy
+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."
+msgstr ""
+
+#: actions/facebooksettings.php:106
+msgid "Prefix"
+msgstr ""
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
+msgstr ""
+
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Π�οτιμήσεις"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.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
+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/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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Αποσ�νδεση"
+
+#: actions/grouplogo.php:450
+msgid "Failed updating logo."
+msgstr ""
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+msgstr ""
+
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#, fuzzy
+msgid "Create a new group"
+msgstr "Δημιου�γία νέου λογα�ιασμο�"
+
+#: actions/groupsearch.php:57
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+msgstr ""
+
+#: actions/groupsearch.php:63
+msgid "Group search"
+msgstr ""
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
+msgstr ""
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+msgid "Send me replies through Jabber/GTalk "
+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."
+msgstr ""
+
+#: actions/joingroup.php:95
+msgid "You are already a member of that group"
+msgstr ""
+
+#: actions/joingroup.php:128
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr ""
+
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+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 ""
+
+#: actions/leavegroup.php:138
+#, php-format
+msgid "Could not remove user %s to group %s"
+msgstr ""
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: 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
+#, 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
+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 ""
+
+#: 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/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/openidsettings.php:128
+msgid "Removing your only OpenID "
+msgstr ""
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:112
+msgid "Service"
+msgstr ""
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Η τοποθεσία είναι πολ� μεγάλη (μέγιστο 255 χα�ακτ.)."
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Αλλαγή κωδικο�"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "Ο κωδικός αποθηκε�τηκε."
+
+#: actions/peopletag.php:35
+#, 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 ""
+
+#: actions/peopletag.php:91
+#, 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"
+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 ""
+
+#: actions/profilesettings.php:311
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: actions/public.php:107
+#, php-format
+msgid "Public timeline, page %d"
+msgstr ""
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/public.php:220
+#, 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"
+msgstr ""
+
+#: actions/publictagcloud.php:63
+#, 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 ""
+
+#: 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, "
+msgstr ""
+
+#: actions/register.php:471
+#, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr ""
+
+#: 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 ""
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
+msgstr ""
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+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"
+msgstr ""
+
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+msgid "Note"
+msgstr ""
+
+#: actions/showgroup.php:270
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, php-format
+msgid "Notice feed for %s group"
+msgstr ""
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, 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 ""
+
+#: actions/showgroup.php:370
+msgid "All members"
+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 "
+msgstr ""
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
+msgstr ""
+
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
+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"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+msgid "All subscribers"
+msgstr ""
+
+#: actions/showstream.php:533
+msgid "All groups"
+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 "
+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. "
+msgstr ""
+
+#: actions/smssettings.php:453
+msgid "Mobile carrier"
+msgstr ""
+
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+msgstr ""
+
+#: actions/subedit.php:83
+#, fuzzy
+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 ""
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr ""
+
+#: actions/subscribers.php:63
+msgid "These are the people who listen to "
+msgstr ""
+
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who "
+msgstr ""
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
+
+#: actions/subscriptions.php:54
+#, php-format
+msgid "%s subscriptions, page %d"
+msgstr ""
+
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices "
+msgstr ""
+
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose "
+msgstr ""
+
+#: actions/subscriptions.php:122
+msgid "Jabber"
+msgstr ""
+
+#: actions/tag.php:43
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr ""
+
+#: actions/tag.php:66
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+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: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."
+msgstr ""
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+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."
+msgstr ""
+
+#: actions/tagrss.php:35
+msgid "No such tag."
+msgstr ""
+
+#: actions/tagrss.php:66
+#, php-format
+msgid "Microblog tagged with %s"
+msgstr ""
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+msgid "Not found."
+msgstr ""
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:126
+#, 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
+#, 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 ""
+
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:71
+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 ""
+
+#: classes/Notice.php:104
+msgid "Problem saving notice. Unknown user."
+msgstr ""
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: 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"
+msgstr ""
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328
+#, fuzzy
+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 ""
+
+#: lib/action.php:332
+msgid "Logout from the site"
+msgstr ""
+
+#: lib/action.php:335
+msgid "Login to the site"
+msgstr ""
+
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Δημιου�γία νέου λογα�ιασμο�"
+
+#: lib/action.php:341
+msgid "Login with OpenID"
+msgstr ""
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Βοήθεια"
+
+#: lib/action.php:362
+msgid "Site notice"
+msgstr ""
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+msgid "Page notice"
+msgstr ""
+
+#: lib/action.php:562
+msgid "Secondary site navigation"
+msgstr ""
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+msgid "All "
+msgstr ""
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+msgid "Block this user"
+msgstr ""
+
+#: lib/blockform.php:153
+msgid "Block"
+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
+msgid "Favor this notice"
+msgstr ""
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr ""
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
+
+#: lib/galleryaction.php:137
+msgid "Tag"
+msgstr ""
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+msgid "URL of the homepage or blog of the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:151
+msgid "Description"
+msgstr ""
+
+#: lib/groupeditform.php:153
+msgid "Describe the group or topic in 140 chars"
+msgstr ""
+
+#: lib/groupeditform.php:158
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Αποσ�νδεση"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+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
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Η α�χική σελίδα δεν είναι έγκυ�ο URL."
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Σ�νδεση"
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr ""
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Λάθος όνομα χ�ήστη ή κωδικός"
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Δημιου�γία νέου λογα�ιασμο�"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, php-format
+msgid "%1$s is now listening to "
+msgstr ""
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Τοποθεσία"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Α�χική σελίδα"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
+
+#: lib/mail.php:555
+#, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr ""
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
+msgstr ""
+
+#: lib/messageform.php:110
+msgid "Send a direct notice"
+msgstr ""
+
+#: lib/noticeform.php:125
+msgid "Send a notice"
+msgstr ""
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 ή πε�ισσότε�οι χα�ακτή�ες"
+
+#: lib/noticelist.php:426
+msgid "in reply to"
+msgstr ""
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
+msgstr ""
+
+#: lib/noticelist.php:451
+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 ""
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr ""
+
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr ""
+
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr ""
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr ""
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
+msgstr ""
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90
+msgid "Popular"
+msgstr ""
+
+#: lib/searchgroupnav.php:82
+msgid "Notice"
+msgstr ""
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr ""
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, php-format
+msgid "People %s subscribes to"
+msgstr ""
+
+#: lib/subgroupnav.php:89
+#, php-format
+msgid "People subscribed to %s"
+msgstr ""
+
+#: lib/subgroupnav.php:97
+#, 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 ""
+
+#: lib/subs.php:53
+msgid "User has blocked you."
+msgstr ""
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr ""
+
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr ""
+
+#: lib/topposterssection.php:74
+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 "Δημιου�γία νέου λογα�ιασμο�"
diff --git a/locale/en_GB/LC_MESSAGES/laconica.mo b/locale/en_GB/LC_MESSAGES/laconica.mo
index a62774f34..daeebef56 100644
--- a/locale/en_GB/LC_MESSAGES/laconica.mo
+++ b/locale/en_GB/LC_MESSAGES/laconica.mo
diff --git a/locale/en_GB/LC_MESSAGES/laconica.po b/locale/en_GB/LC_MESSAGES/laconica.po
index 726a771b1..02ad09331 100644
--- a/locale/en_GB/LC_MESSAGES/laconica.po
+++ b/locale/en_GB/LC_MESSAGES/laconica.po
@@ -7,46 +7,85 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (laconica)  #-#-#-#-#\n"
-"Project-Id-Version: laconica\n"
-"Report-Msgid-Bugs-To: john@nextraweb.com\n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: 2008-08-05 01:44+0100\n"
-"Last-Translator: John Drinkwater <john@nextraweb.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.pot (laconica)  #-#-#-#-#\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Search Stream for ‘%s’"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../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 ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:347
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+"%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 ""
-"except this private data: password, e-mail address, IM address, phone "
-"number."
 
-#: ../actions/subscribe.php:84
+#: ../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."
 
-#: ../actions/subscribe.php:86 ../lib/mail.php:126
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -57,409 +96,792 @@ msgid ""
 "%4$s.\n"
 msgstr ""
 
-#: ../actions/shownotice.php:45
+#: ../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 "%1$s’s status on %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../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 ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Public Stream"
 
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#: ../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 and friends"
 
-#: ../lib/util.php:233
+#: ../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
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
 #, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)"
 
-#: ../lib/util.php:235
+#: ../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%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)"
+
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** is a microblogging service."
 
-#: ../lib/util.php:250
+#: ../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/register.php:176
+#: 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/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
 msgstr "6 or more characters"
 
-#: ../actions/recoverpassword.php:165
+#: ../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/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../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/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 confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
 
-#: ../lib/util.php:296
+#: ../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 ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
 msgstr "About"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "Accept"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "Add OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92
 msgid "Address"
 msgstr "Address"
 
-#: ../actions/showstream.php:254
+#: ../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 "All subscriptions"
 
-#: ../actions/publicrss.php:62
+#: ../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/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "All updates matching search term ‘%s’"
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "Already subscribed!"
 
-#: ../actions/userauthorization.php:76
+#: ../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 "Authorise subscription"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatically log-in in the future; not for shared computers!"
 
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34
+#: actions/profilesettings.php:34 actions/avatarsettings.php:65
+#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
 msgid "Avatar"
 msgstr ""
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "Avatar updated."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy "
-"list?)"
+"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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+#: actions/smssettings.php:111
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
 
 #  erm, not sure what to do here, » is recognised as a quotation mark.
-#: ../lib/util.php:1136
+#: ../lib/util.php:1318 lib/util.php:1452
+#, fuzzy
 msgid "Before »"
 msgstr "Before →"
 
-#: ../actions/profilesettings.php:52 ../actions/profilesettings.php:49
-#: ../actions/register.php:170 actions/profilesettings.php:82
-#: actions/register.php:184
+#: ../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:93 ../actions/updateprofile.php:102
+#: ../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/updateprofile.php:118
+#: ../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 "Can’t read avatar URL ‘%s’"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+#: ../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/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: 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:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Cannot instantiate OpenID consumer object."
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
 msgid "Cannot normalize that Jabber ID"
 msgstr "Cannot normalise Jabber ID"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "Change"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Change password"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../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 "Confirm"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Confirm Address"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "Confirmation cancelled."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Confirmation code not found."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "Connect"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "Connect existing account"
 
-#: ../lib/util.php:304 ../lib/util.php:332 lib/util.php:348
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr ""
 
 #  Thought form was incorrect
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Could not create OpenID from: %s"
 
-#: ../lib/openid.php:160
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow 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 "Could not redirect to server: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../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:154
+#: ../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"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Couldn’t confirm e-mail."
+#: ../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 "Couldn’t convert request tokens to access tokens."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Couldn’t create subscription."
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: 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/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
 msgstr "Couldn’t delete subscription."
 
-#: ../actions/remotesubscribe.php:125
+#: ../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."
 msgstr "Couldn’t get a request token."
 
-#: ../actions/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: 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/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
 msgid "Couldn't insert new subscription."
 msgstr "Couldn’t insert new subscription."
 
-#: ../actions/profilesettings.php:175
+#: ../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/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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 "Couldn’t update user."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Create"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "Create new account"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../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/imsettings.php:45
+#: ../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/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../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 "Currently"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "DB error inserting reply: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../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 "Describe yourself and your interests in 140 chars"
 
-#: ../actions/register.php:181 ../actions/register.php:158
-#: ../actions/register.php:161 ../lib/settingsaction.php:87
-#: actions/register.php:172 actions/register.php:175 lib/settingsaction.php:87
+#: ../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/profilesettings.php:46
-msgid "Email address"
-msgstr "E-mail address"
+#: ../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/profilesettings.php:102 ../actions/register.php:63
+#: ../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:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
 msgstr "E-mail address confirmation"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../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 "Enter a nickname or e-mail address."
 
-#: ../actions/userauthorization.php:136
+#: ../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 "Error authorising token."
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:297
 msgid "Error connecting user to OpenID."
 msgstr "Error connecting user to OpenID."
 
-#: ../actions/finishaddopenid.php:78
+#: ../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 "Error inserting avatar"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
 msgid "Error inserting new profile"
 msgstr "Error inserting new profile"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Error inserting notice"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
 msgid "Error inserting remote profile"
 msgstr "Error inserting remote profile"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
 msgstr "Error saving address confirmation."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
 msgid "Error saving remote profile"
 msgstr "Error saving remote profile"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving the profile."
 msgstr "Error saving the profile."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
 msgid "Error saving the user."
 msgstr "Error saving the user."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164
 msgid "Error saving user; invalid."
 msgstr "Error saving user; invalid."
 
-#: ../actions/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 actions/login.php:112 actions/login.php:138
+#: actions/recoverpassword.php:354 actions/register.php:198
 msgid "Error setting user."
 msgstr "Error setting user."
 
 #  Added full stop
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
 msgid "Error updating profile"
 msgstr "Error updating profile."
 
 #  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/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+#: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
 msgstr "Error with confirmation code."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "Existing nickname"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "F.A.Q."
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "Failed to update avatar."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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 friends of %s"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../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/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, 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
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -467,41 +889,70 @@ msgstr ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 
-#: ../actions/profilesettings.php:44
+#: ../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:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "Help"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "Home"
 
-#: ../actions/profilesettings.php:49
+#: ../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:87
+#: ../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 ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: lib/connectsettingsaction.php:104
+msgid "IM"
+msgstr ""
+
 #  possibly use I.M.
-#: ../actions/imsettings.php:61
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
+#: actions/imsettings.php:118
 msgid "IM Address"
 msgstr "IM Address"
 
 #  requires full stops?
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "IM Settings"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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."
@@ -517,23 +968,34 @@ msgstr ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click ‘Add’."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"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/password.php:69
+#: ../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 "Incorrect old password"
 
-#: ../actions/login.php:63
+#: ../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/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -542,518 +1004,890 @@ msgstr ""
 "address registered to your account."
 
 #  Avatar?
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Invalid avatar URL ‘%s’"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Invalid homepage ‘%s’"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Invalid licence URL ‘%s’"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
 msgid "Invalid notice content"
 msgstr "Invalid notice content"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72
 msgid "Invalid notice uri"
 msgstr "Invalid notice URI"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "Invalid notice URL"
 
-#: ../actions/updateprofile.php:86
+#: ../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/remotesubscribe.php:96
+#: ../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/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:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Invalid size."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
 msgid "Invalid username or password."
 msgstr "Invalid username or password."
 
-#: ../lib/util.php:237
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"Licence](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public Licence](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../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:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
-"Jabber or GTalk address, like ‘UserName@example.org’. First, make sure "
-"to add %s to your buddy list in your IM client or on GTalk."
+"Jabber or GTalk address, like ‘UserName@example.org’. First, make sure to "
+"add %s to your buddy list in your IM client or on GTalk."
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:128
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:217
+msgid "Language is too long (max 50 chars)."
+msgstr ""
 
-#: ../actions/profilesettings.php:55
+#: ../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/profilesettings.php:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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/login.php:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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 "Log-in"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Log-in with an [OpenID](%%doc.openid%%) account."
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
-"Log-in with your username and password. Don’t have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%)."
+"Log-in with your username and password. Don’t have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Log out"
 
-#: ../actions/login.php:106
+#: ../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 "Lost or forgotten password?"
 
-#: ../actions/showstream.php:281
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php: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 "Member since"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog by %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/finishopenidlogin.php:107 actions/register.php:429
 msgid "My text and files are available under "
 msgstr "My text and files are available under"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../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 ""
+
+#: ../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 "New nickname"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "New notice"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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/recoverpassword.php:275
+#: ../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/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../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/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59
+#: ../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/finishopenidlogin.php:165 ../actions/profilesettings.php:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
 msgstr "Nickname not allowed."
 
-#: ../actions/remotesubscribe.php:72
+#: ../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/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "Nickname or e-mail"
 
-#: ../actions/imsettings.php:147
+#: ../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 "No Jabber ID."
 
-#: ../actions/userauthorization.php:128 ../actions/userauthorization.php:129
-#: actions/userauthorization.php:136
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr ""
 
-#: ../actions/confirmaddress.php:33
+#: ../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 "No confirmation code."
 
-#: ../actions/newnotice.php:49
+#: ../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!"
 
-#: ../actions/userbyid.php:27
+#: ../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 "No 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 "No nickname provided by remote server."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
 msgstr "No nickname."
 
-#: ../actions/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: 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/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 "No profile URL returned by server."
 
-#: ../actions/recoverpassword.php:189
+#: ../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/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
 msgid "No request found!"
 msgstr "No request found!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/groupsearch.php:81 actions/noticesearch.php:104
+#: actions/peoplesearch.php:85
 msgid "No results"
 msgstr "No results"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "No size."
 
-#: ../actions/openidsettings.php:135
+#: ../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/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+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 "No such OpenID."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "No such document."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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 such notice."
 
-#: ../actions/recoverpassword.php:56
+#: ../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: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:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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."
 
-#: ../lib/gallery.php:76
+#: ../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 "Nobody to show!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+#: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr "Not a recovery code."
 
-#: ../actions/imsettings.php:158
+#: ../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 "Not a valid Jabber ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "Not a valid OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../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 "Not a valid e-mail address."
 
-#: ../actions/profilesettings.php:83 ../actions/register.php:61
+#: ../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/remotesubscribe.php:118
+#: ../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/remotesubscribe.php:111
+#: ../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/remotesubscribe.php:104
+#: ../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/avatar.php:95
+#: ../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/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "Not authorised."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "Not expecting this response!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/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 "Not logged in."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "Not subscribed!"
 
-#: ../actions/showstream.php:82
+#: ../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 "Notice feed for %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:94
 msgid "Notice has no profile"
 msgstr "Notice has no profile"
 
-#: ../actions/showstream.php:297
+#: ../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/password.php:39
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "Old password"
 
-#: ../lib/util.php:288 ../lib/settingsaction.php:96 ../lib/util.php:314
-#: lib/settingsaction.php:90 lib/util.php:330
+#: ../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/finishopenidlogin.php:61
+#: ../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: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/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
 msgid "OpenID Login"
 msgstr "OpenID Log-in"
 
 #: ../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:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID failure: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "OpenID settings"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "Partial upload."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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/recoverpassword.php:249
+#: ../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/recoverpassword.php:245
+#: ../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/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../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/password.php:89 ../actions/recoverpassword.php:274
-#: ../actions/recoverpassword.php:313 actions/profilesettings.php:408
-#: actions/recoverpassword.php:326
+#: ../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/password.php:61 ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../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"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "People search"
 
-#: ../lib/stream.php:44 ../lib/stream.php:50 lib/personal.php:50
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr ""
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/userauthorization.php:78
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
 "Please verify the details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s "
-"notices, click ‘Cancel’."
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click ‘Cancel’."
 
-#: ../actions/imsettings.php:74
+#: ../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/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
-#: ../lib/util.php:300
+#: ../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 "Privacy"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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/stream.php:54
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "Profile URL"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
 msgstr "Profile settings"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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 "Unknown profile"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr ""
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Public Stream Feed"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "Public timeline"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr "Recover"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198
 msgid "Recover password"
 msgstr "Recover password"
 
-#: ../actions/recoverpassword.php:67
+#: ../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/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: 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/userauthorization.php:119 ../actions/userauthorization.php:120
-#: actions/userauthorization.php:127
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr ""
 
-#: ../actions/login.php:99 ../actions/register.php:183
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190
+#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414
 msgid "Remember me"
 msgstr ""
 
-#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr ""
 
-#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
 #: ../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/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/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr ""
 
@@ -1063,51 +1897,82 @@ msgid ""
 "remove it, add another OpenID first."
 msgstr ""
 
-#: ../lib/stream.php:49 ../lib/stream.php:55 lib/personal.php:55
+#: ../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:50
-#: ../lib/stream.php:56 actions/replies.php:47 actions/repliesrss.php:62
-#: lib/personal.php:56
+#: ../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 ""
 
-#: ../actions/recoverpassword.php:168 ../actions/recoverpassword.php:183
-#: actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr ""
 
-#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr ""
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr ""
+
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
 msgid "Same as password above"
 msgstr ""
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../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/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:73 ../lib/util.php:277 ../lib/searchaction.php:84
-#: ../lib/util.php:300 lib/searchaction.php:84 lib/util.php:316
+#: ../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 ""
 
 #: ../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 "
@@ -1121,150 +1986,255 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../lib/util.php:982 ../actions/invite.php:137 ../lib/util.php:1172
-#: actions/invite.php:145 lib/util.php:1306 lib/util.php:1731
+#: ../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/imsettings.php:71 ../actions/imsettings.php:70
-#: actions/imsettings.php:71
+#: ../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 ""
 
-#: ../lib/util.php:282 ../lib/util.php:304 lib/util.php:320
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr ""
 
-#: ../actions/profilesettings.php:183 ../actions/profilesettings.php:192
-#: actions/profilesettings.php:307
+#: ../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 ""
 
 #: ../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 ""
 
-#: ../lib/util.php:302 ../lib/util.php:330 lib/util.php:346
+#: ../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:277 ../actions/showstream.php:296
-#: actions/showstream.php:311
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
-#: ../actions/finishopenidlogin.php:246 actions/finishopenidlogin.php:188
-#: actions/finishopenidlogin.php:252
+#: ../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 ""
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181 ../actions/showstream.php:188
+#: ../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:294 ../actions/subscribers.php:27
-#: ../actions/showstream.php:313 actions/showstream.php:328
-#: actions/subscribers.php:27
+#: ../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:309 ../actions/userauthorization.php:310
-#: actions/userauthorization.php:322
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr ""
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "Subscription rejected"
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../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/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
 msgid "System error uploading file."
 msgstr "System error uploading file."
 
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
+#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
+#: lib/profilelist.php:164
+msgid "Tags"
+msgstr ""
+
+#: ../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: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/confirmaddress.php:52 actions/confirmaddress.php:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 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:191 actions/emailsettings.php:209
+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/imsettings.php:161 ../actions/imsettings.php:170
-#: actions/imsettings.php:178
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr ""
 
-#: ../actions/imsettings.php:224 ../actions/imsettings.php:233
-#: actions/imsettings.php:241
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr ""
 
-#: ../actions/imsettings.php:201 ../actions/emailsettings.php:226
-#: ../actions/imsettings.php:210 actions/emailsettings.php:244
-#: actions/imsettings.php:218
+#: ../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 ""
 
-#: ../actions/newnotice.php:52 ../actions/newnotice.php:49
-#: ../actions/twitapistatuses.php:408 actions/newnotice.php:49
-#: actions/twitapistatuses.php:330
+#: ../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 ""
 
-#: ../actions/confirmaddress.php:86 ../actions/confirmaddress.php:92
-#: actions/confirmaddress.php:92
+#: ../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/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
-#: ../actions/imsettings.php:241 ../actions/emailsettings.php:264
-#: ../actions/imsettings.php:250 ../actions/smssettings.php:274
-#: actions/emailsettings.php:282 actions/imsettings.php:258
-#: actions/smssettings.php:282
+#: ../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:311 ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: ../actions/userauthorization.php:321 ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "These are the people who listen to %s’s notices."
@@ -1282,7 +2252,12 @@ msgstr ""
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: ../actions/recoverpassword.php:87 ../actions/recoverpassword.php:88
+#: ../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/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
@@ -1293,6 +2268,7 @@ msgid ""
 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 "
@@ -1300,74 +2276,137 @@ msgid ""
 "your existing account, if you have one."
 msgstr ""
 
-#: ../lib/util.php:147 ../lib/util.php:164 lib/util.php:246
+#: ../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"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: ../actions/profilesettings.php:51 ../actions/profilesettings.php:48
-#: ../actions/register.php:169 actions/profilesettings.php:81
-#: actions/register.php:183
+#: ../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 ""
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/smssettings.php:135 actions/emailsettings.php:144
-#: actions/imsettings.php:118 actions/recoverpassword.php:39
-#: actions/smssettings.php:143 actions/twittersettings.php:108
+#: ../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:237 ../actions/recoverpassword.php:276
-#: actions/recoverpassword.php:289
+#: ../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:60 actions/finishremotesubscribe.php:61
 msgid "Unknown version of OMB protocol."
 msgstr ""
 
-#: ../lib/util.php:245 ../lib/util.php:269 lib/util.php:285
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
 
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../actions/showstream.php:193 ../actions/showstream.php:209
-#: actions/showstream.php:219
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
-#: ../actions/updateprofile.php:45 actions/postnotice.php:45
-#: actions/updateprofile.php:46
+#: ../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/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr ""
 
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 ""
 
@@ -1379,75 +2418,126 @@ msgid ""
 "share."
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../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: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:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/foaf.php:47
-#: ../actions/twitapiaccount.php:82 ../actions/twitapistatuses.php:319
-#: ../actions/twitapistatuses.php:685 ../actions/twitapiusers.php:82
-#: actions/all.php:41 actions/avatarbynickname.php:48 actions/foaf.php:47
-#: actions/replies.php:41 actions/showfavorites.php:41
-#: actions/showstream.php:44 actions/twitapiaccount.php:80
-#: actions/twitapifavorites.php:68 actions/twitapistatuses.php:235
-#: actions/twitapistatuses.php:609 actions/twitapiusers.php:87
-#: lib/mailbox.php:50
+#: ../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/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr ""
 
-#: ../lib/util.php:969 ../lib/util.php:1159 lib/util.php:1293
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 ../actions/profilesettings.php:54
-#: ../actions/register.php:175 actions/profilesettings.php:87
-#: actions/register.php:189
+#: ../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/updateprofile.php:127 ../actions/updateprofile.php:128
-#: actions/updateprofile.php:129
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:122 ../actions/updateprofile.php:123
-#: actions/updateprofile.php:124
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, 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
+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!"
 msgstr ""
 
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr ""
 
-#: ../actions/register.php:164 ../actions/register.php:135
-#: actions/register.php:145
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr ""
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -1457,41 +2547,72 @@ 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."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: 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:51
-#: ../actions/register.php:61 actions/finishopenidlogin.php:38
-#: actions/register.php:68
+#: ../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:62 ../actions/updateprofile.php:63
-#: actions/updateprofile.php:64
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67
 msgid "You did not send us that profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:134 ../actions/recoverpassword.php:149
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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 ""
 
-#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
@@ -1502,1374 +2623,2183 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:814 ../lib/util.php:943 lib/util.php:992
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr ""
 
-#: ../lib/util.php:826 ../lib/util.php:955 lib/util.php:1004
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: ../lib/util.php:822 ../lib/util.php:951 lib/util.php:1000
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: ../lib/util.php:818 ../lib/util.php:947 lib/util.php:996
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: ../lib/util.php:830 ../lib/util.php:959 lib/util.php:1008
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: ../lib/util.php:824 ../lib/util.php:953 lib/util.php:1002
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr ""
 
-#: ../lib/util.php:816 ../lib/util.php:945 lib/util.php:994
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr ""
 
-#: ../lib/util.php:828 ../lib/util.php:957 lib/util.php:1006
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr ""
 
-#: ../lib/util.php:832 ../lib/util.php:961 lib/util.php:1010
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr ""
 
-#: ../lib/util.php:820 ../lib/util.php:949 lib/util.php:998
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr ""
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101 ../actions/noticesearch.php:130
-#: ../actions/showstream.php:408 ../lib/stream.php:117
-#: actions/noticesearch.php:136 actions/showstream.php:426 lib/stream.php:84
+#: ../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:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108 ../actions/noticesearch.php:137
-#: ../actions/showstream.php:415 ../lib/stream.php:124
-#: actions/noticesearch.php:143 actions/showstream.php:433 lib/stream.php:91
+#: ../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 ""
+
 #  erm, not sure what to do here, « is recognised as a quotation mark.
-#: ../lib/util.php:1127
+#: ../lib/util.php:1309 lib/util.php:1443
+#, fuzzy
 msgid "« After"
 msgstr "� After"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
+#: 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/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: 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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
+msgid "%s favorite notices"
 msgstr ""
 
-#: ../actions/invite.php:168 actions/invite.php:176
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
+msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+#: 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:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
+#: actions/login.php:122 actions/login.php:264
+msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
+#: actions/login.php:126 actions/login.php:268
+msgid "Login with your username and password. "
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
+#: 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/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
+#: 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/register.php:213
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+msgid "No such user"
 msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
+#: actions/newmessage.php:117 actions/newmessage.php:67
+msgid "New message"
 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/noticesearch.php:95 actions/noticesearch.php:146
+msgid "Notice without matching profile"
 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/openidsettings.php:28 actions/openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+#: actions/outbox.php:53 actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+"Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
+msgid "You can update your personal profile info here "
 msgstr ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
+#: 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/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+msgid "This confirmation code is too old. "
 msgstr ""
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
 msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
 msgstr ""
 
-#: ../actions/register.php:202
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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...\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."
+"want to..."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: 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 "Could not follow user: %s is already on your list."
+msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
 msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
+#: actions/showstream.php:154
+msgid "Send a message"
 msgstr ""
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, php-format
+msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#, php-format
+msgid "Direct messages to %s"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
+msgid "No message text!"
 msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
+#: 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/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
-msgid "Feed for tag %s"
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
+#: 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 ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
+#: 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 ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+msgid "Twitter settings"
 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/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+msgid "Current verified Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
 msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
 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/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
+msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+msgid "Twitter settings saved."
 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/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
+msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
+#: 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/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+msgid "Twitter preferences saved."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
+msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
+msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+msgid "Command results"
 msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
+#: classes/Command.php:96 classes/Command.php:113
+#, php-format
+msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
+msgid "User has no last notice"
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
+#: classes/Command.php:146 classes/Command.php:166
+msgid "Notice marked as fave."
 msgstr ""
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
-msgid "Notices tagged with %s"
+msgid "Homepage: %s"
 msgstr ""
 
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
 msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
+#: classes/Command.php:295 classes/Command.php:335
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: 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:28 actions/register.php:28
-msgid "Registration not allowed."
+#: classes/Command.php:313 classes/Command.php:356
+msgid "Notification off."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
+#: classes/Message.php:53 classes/Message.php:56
+msgid "Could not insert message."
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
+#: classes/Message.php:63 classes/Message.php:66
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
 msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: lib/mail.php:253 lib/mail.php:512
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: lib/mailbox.php:43 lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: lib/openid.php:195 lib/openid.php:203
+msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+msgid "Favorites"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
 msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
 msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
+msgid "Twitter"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
+msgid "Twitter integration options"
 msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+msgid "Could not parse message."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s and friends"
+
+#: actions/avatarsettings.php:76
+msgid "You can upload your personal avatar."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#  requires full stops?
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "IM Settings"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "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 ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
 msgstr ""
 
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
+#: actions/avatarsettings.php:334 actions/grouplogo.php:391
+#: classes/User_group.php:112
+#, fuzzy
+msgid "Lost our file."
+msgstr "No such notice."
+
+#: 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 ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "No such user."
+
+#: 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
 #, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+msgid "The address \"%s\" has been "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/deletenotice.php:73
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
 #, php-format
-msgid "Updates from %1$s on %2$s!"
+msgid "Edit %s group"
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: 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/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: 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 "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
+#, fuzzy
+msgid "No such group"
+msgstr "No such notice."
+
+#: 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:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
+msgstr "Nickname must have only lowercase letters and numbers and no spaces."
+
+#: actions/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "Bio is too long (max 140 chars)"
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Couldn’t update user."
+
+#: actions/editgroup.php:226
+msgid "Options saved."
 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/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Error with confirmation code."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/emailsettings.php:321
+#, fuzzy
+msgid "That email address already belongs "
+msgstr "E-mail address already exists."
+
+#: actions/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
+msgstr ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+
+#: actions/facebookhome.php:110
+msgid "Server error - couldn't get user!"
+msgstr ""
+
+#: actions/facebookhome.php:196
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "If you would like the %s app to automatically update "
 msgstr ""
 
-#: ../lib/mail.php:147
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, 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 "Allow %s to update my Facebook status"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: actions/facebookhome.php:218
+msgid "Skip"
+msgstr ""
+
+#: actions/facebookhome.php:235
+#, fuzzy
+msgid "No notice content!"
+msgstr "No content!"
+
+#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+msgid "Pagination"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
+#  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
+#, fuzzy
+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
+#, fuzzy
+msgid "Before"
+msgstr "Before →"
+
+#: actions/facebookinvite.php:70
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "Feed for friends of %s"
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
 msgstr ""
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Couldn’t update user."
+
+#: actions/facebooksettings.php:65
+msgid "There was a problem saving your sync preferences!"
 msgstr ""
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Preferences saved."
+
+#: actions/facebooksettings.php:90
+msgid "Automatically update my Facebook status with my notices."
 msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Favor"
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Profile"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
 msgstr ""
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Preferences"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+#, fuzzy
+msgid "Popular notices"
+msgstr "No such notice."
+
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "No such notice."
+
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/featured.php:71
 #, php-format
-msgid "%s favorite notices"
+msgid "Featured users, page %d"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/featured.php:99
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/inbox.php:28
+#: 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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Avatar updated."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Failed to update avatar."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
-msgid "Inbox for %s - page %d"
+msgid "%s group members"
 msgstr ""
 
-#: actions/inbox.php:30
+#: actions/groupmembers.php:96
 #, php-format
-msgid "Inbox for %s"
+msgid "%s group members, page %d"
 msgstr ""
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr ""
+
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
+msgstr ""
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: actions/invite.php:178
+#: actions/groups.php:90
+#, 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
+#, fuzzy
+msgid "Create a new group"
+msgstr "Create new account"
+
+#: actions/groupsearch.php:57
 #, php-format
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "People search"
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
 msgstr ""
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
 msgstr ""
 
-#: actions/login.php:126
-msgid "Login with your username and password. "
+#: actions/imsettings.php:147
+msgid "Send me replies through Jabber/GTalk "
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "No confirmation code."
+
+#: actions/joingroup.php:65
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/newmessage.php:65
-msgid "No recipient specified."
+#: actions/joingroup.php:95
+msgid "You are already a member of that group"
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
+#: actions/joingroup.php:128
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Could not redirect to server: %s"
+
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/newmessage.php:108
-msgid "No such user"
+#: actions/leavegroup.php:65
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/newmessage.php:117
-msgid "New message"
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "No such notice."
+
+#: actions/leavegroup.php:95
+msgid "You are not a member of that group."
 msgstr ""
 
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
+#: actions/leavegroup.php:100
+msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/openidsettings.php:28
+#: actions/leavegroup.php:130
+msgid "Could not find membership record."
+msgstr ""
+
+#  Thought form was incorrect
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Could not create OpenID from: %s"
+
+#: actions/leavegroup.php:145
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgid "%s left group %s"
 msgstr ""
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: actions/outbox.php:28
-#, php-format
-msgid "Outbox for %s - page %d"
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/outbox.php:30
-#, php-format
-msgid "Outbox for %s"
+#: actions/newgroup.php:177
+#, fuzzy
+msgid "Could not create group."
+msgstr "Could not save avatar info"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Couldn’t create subscription."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+msgid "That's too long. "
 msgstr ""
 
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "Notices"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
 msgstr ""
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
+#: actions/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "OpenID Log-in"
+
+#: actions/openidsettings.php:128
+msgid "Removing your only OpenID "
 msgstr ""
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
+#  requires full stops?
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "IM Settings"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
 msgstr ""
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
+#: actions/othersettings.php:112
+msgid "Service"
 msgstr ""
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Location is too long (max 255 chars)."
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Change password"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "Password"
+
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Not a valid e-mail address."
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: actions/register.php:216
+#: actions/peopletag.php:91
 #, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "Unknown profile"
+
+#: actions/profilesettings.php:124
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/profilesettings.php:144
+msgid "Automatically subscribe to whoever "
+msgstr ""
+
+#: actions/profilesettings.php:229 actions/tagother.php:176
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Invalid homepage ‘%s’"
+
+#: actions/profilesettings.php:311
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Couldn’t save profile."
+
+#: actions/public.php:107
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Public timeline"
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: actions/public.php:220
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
 
-#: actions/showfavorites.php:61
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Public Stream Feed"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Feed for favorites of %s"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/showmessage.php:33
-msgid "No such message."
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: 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/showmessage.php:61
+#: actions/register.php:368
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, "
+msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
+
+#: 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
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Describe yourself and your interests in 140 chars"
+
+#: actions/register.php:410
+msgid "Where you are, like \"City, "
+msgstr ""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+msgstr ""
+"except this private data: password, e-mail address, IM address, phone number."
+
+#: actions/register.php:471
 #, php-format
-msgid "Message to %1$s on %2$s"
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr ""
+
+#: actions/register.php:495
+msgid "(You should receive a message by email "
 msgstr ""
 
-#: actions/showmessage.php:66
+#: 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 "Message from %1$s on %2$s"
+msgid "Replies to %s, page %d"
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/smssettings.php:312
+#: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
-msgid "Mobile carrier for your phone. "
+msgid "%s group"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/showgroup.php:79
 #, php-format
-msgid "Direct messages to %s"
+msgid "%s group, page %d"
+msgstr ""
+
+#: actions/showgroup.php:206
+#, fuzzy
+msgid "Group profile"
+msgstr "No such notice."
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
+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 "Notices"
+
+#: actions/showgroup.php:270
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Notice feed for %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
+msgid "Members"
+msgstr "Member since"
+
+#: 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/showgroup.php:370
+msgid "All members"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/showgroup.php:378
 #, php-format
-msgid "All the direct messages sent to %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/showstream.php:73
 #, php-format
-msgid "All the direct messages sent from %s"
+msgid "%s, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Profile"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "No such notice."
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
+#: actions/showstream.php:317
+msgid "User actions"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "All subscriptions"
+
+#: actions/showstream.php:533
+msgid "All groups"
+msgstr ""
+
+#: actions/showstream.php:542
 #, php-format
-msgid "%s / Favorites from %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/smssettings.php:128
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, "
+msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
+
+#: actions/smssettings.php:162
+msgid "Send me notices through SMS; "
+msgstr ""
+
+#: actions/smssettings.php:335
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. "
+msgstr ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+
+#: actions/smssettings.php:453
+msgid "Mobile carrier"
+msgstr ""
+
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+msgstr ""
+
+#: actions/subedit.php:83
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Couldn’t create subscription."
+
+#: actions/subscribe.php:55
+#, fuzzy
+msgid "Not a local user."
+msgstr "No such user."
+
+#: actions/subscribe.php:69
+#, fuzzy
+msgid "Subscribed"
+msgstr "Not subscribed!"
+
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Not subscribed!"
+
+#: actions/subscribers.php:52
 #, php-format
-msgid "%s updates favorited by %s / %s."
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/subscribers.php:63
+#, fuzzy
+msgid "These are the people who listen to "
+msgstr "These are the people who listen to %s’s notices."
+
+#: actions/subscribers.php:67
+#, fuzzy, php-format
+msgid "These are the people who "
+msgstr "These are the people who listen to %s’s notices."
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "All subscriptions"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "All subscriptions"
+
+#: actions/subscriptions.php:65
+#, fuzzy
+msgid "These are the people whose notices "
+msgstr "These are the people who listen to %s’s notices."
+
+#: actions/subscriptions.php:69
+#, fuzzy, php-format
+msgid "These are the people whose "
+msgstr "These are the people who listen to %s’s notices."
+
+#: actions/subscriptions.php:122
+#, fuzzy
+msgid "Jabber"
+msgstr "No Jabber ID."
+
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Microblog by %s"
+
+#: actions/tag.php:66
 #, php-format
-msgid "%s added your notice as a favorite"
+msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/tagother.php:33
+#, fuzzy
+msgid "Not logged in"
+msgstr "Not logged in."
+
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No id argument."
+msgstr "No such document."
+
+#: actions/tagother.php:65
 #, php-format
+msgid "Tag %s"
+msgstr ""
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr ""
+
+#: actions/tagother.php:149
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/tagother.php:164
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/tagother.php:191
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
+#: actions/tagother.php:198
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Could not save avatar info"
+
+#: actions/tagother.php:233
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "No such notice."
+
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Microblog by %s"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
 msgstr ""
 
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "No request found!"
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "New password"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
 msgstr ""
 
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
 msgstr ""
 
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
+#: actions/twittersettings.php:341
+#, fuzzy, php-format
+msgid "Unable to retrieve account information "
+msgstr "Couldn’t delete e-mail confirmation."
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Error saving the user."
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "No profile URL returned by server."
+
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
 msgstr ""
 
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Not subscribed!"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
+msgstr ""
+
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Problem saving notice."
+
+#: classes/Notice.php:109
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Failed to update avatar."
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr ""
+
+#: lib/action.php:130
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgid "%s - %s"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
+#: lib/action.php:145
+msgid "Untitled page"
 msgstr ""
 
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
+#: lib/action.php:316
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
+#: lib/action.php:325
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "About"
+
+#: lib/action.php:328
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
+#: lib/action.php:332
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
+#: lib/action.php:335
+msgid "Login to the site"
 msgstr ""
 
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Create new account"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "No such OpenID."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Help"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "New notice"
+
+#: lib/action.php:417
+msgid "Local views"
 msgstr ""
 
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "New notice"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Subscriptions"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
 msgstr ""
 
-#: classes/Channel.php:113
-msgid "Command results"
+#: lib/action.php:630
+msgid "All "
 msgstr ""
 
-#: classes/Channel.php:148
-msgid "Command complete"
+#: lib/action.php:635
+msgid "license."
 msgstr ""
 
-#: classes/Channel.php:158
-msgid "Command failed"
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "No such user."
+
+#: lib/blockform.php:153
+msgid "Block"
 msgstr ""
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
 msgstr ""
 
-#: classes/Command.php:96
+#: lib/facebookaction.php:268
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
+#: lib/facebookaction.php:271
+#, fuzzy
+msgid " a new account."
+msgstr "Create new account"
+
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+msgid "Published"
 msgstr ""
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
+#: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
+msgid "Favor this notice"
+msgstr "No such notice."
+
+#: lib/feedlist.php:64
+msgid "Export data"
 msgstr ""
 
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
+#: lib/galleryaction.php:121
+msgid "Filter tags"
 msgstr ""
 
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
+#: lib/galleryaction.php:131
+msgid "All"
 msgstr ""
 
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
+#: lib/galleryaction.php:137
+msgid "Tag"
 msgstr ""
 
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 
-#: classes/Command.php:178
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Subscriptions"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Describe yourself and your interests in 140 chars"
+
+#: lib/groupeditform.php:158
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
 #, php-format
-msgid "About: %s"
+msgid "Edit %s group properties"
 msgstr ""
 
-#: classes/Command.php:200
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Log out"
+
+#: lib/groupnav.php:107
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Add or edit %s logo"
+msgstr ""
+
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
+msgstr ""
+
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
 msgstr ""
 
-#: classes/Command.php:214
+#: lib/grouptagcloudsection.php:56
 #, php-format
-msgid "Direct message to %s sent"
+msgid "Tags in %s group's notices"
 msgstr ""
 
-#: classes/Command.php:216
-msgid "Error sending direct message."
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Homepage is not a valid URL."
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Log-in"
+
+#: lib/leaveform.php:114
+msgid "Leave"
 msgstr ""
 
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Invalid username or password."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Create new account"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
 msgstr ""
 
-#: classes/Command.php:270
+#: lib/mail.php:175
 #, php-format
-msgid "Subscribed to %s"
+msgid ""
+"Hey, %s.\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s is now listening to your notices on %2$s."
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Location"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Homepage"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:295
+#: lib/mail.php:461
 #, php-format
-msgid "Unsubscribed from %s"
+msgid "You've been nudged by %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr ""
 
-#: classes/Command.php:313
-msgid "Notification off."
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s is now listening to your notices on %2$s."
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
 msgstr ""
 
-#: classes/Command.php:315
-msgid "Can't turn off notification."
+#: lib/messageform.php:110
+msgid "Send a direct notice"
 msgstr ""
 
-#: classes/Command.php:333
-msgid "Notification on."
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "New notice"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 or more characters"
+
+#: lib/noticelist.php:426
+msgid "in reply to"
 msgstr ""
 
-#: classes/Command.php:335
-msgid "Can't turn on notification."
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
 msgstr ""
 
-#: classes/Command.php:344
-msgid "Commands:\n"
+#: lib/noticelist.php:451
+msgid "Reply"
 msgstr ""
 
-#: classes/Message.php:53
-msgid "Could not insert message."
+#: lib/noticelist.php:471 lib/noticelist.php:474
+msgid "Delete this notice"
 msgstr ""
 
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
+#: lib/noticelist.php:474
+msgid "Delete"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
 msgstr ""
 
-#: lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: lib/nudgeform.php:128
+msgid "Nudge"
 msgstr ""
 
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/personaltagcloudsection.php:56
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
+#: lib/profilelist.php:182
+msgid "(none)"
 msgstr ""
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
+#: lib/publicgroupnav.php:76
+msgid "Public"
 msgstr ""
 
-#: lib/personal.php:65
-msgid "Favorites"
+#: lib/publicgroupnav.php:80
+msgid "User groups"
 msgstr ""
 
-#: lib/personal.php:66
-#, php-format
-msgid "%s's favorite notices"
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
 msgstr ""
 
-#: lib/personal.php:66
-msgid "User"
+#: lib/publicgroupnav.php:86
+msgid "Featured"
 msgstr ""
 
-#: lib/personal.php:75
-msgid "Inbox"
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "People search"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Notices"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
 msgstr ""
 
-#: lib/personal.php:76
-msgid "Your incoming messages"
+#: lib/section.php:89
+msgid "Untitled section"
 msgstr ""
 
-#: lib/personal.php:80
-msgid "Outbox"
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "No such subscription"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Not subscribed!"
+
+#: lib/subgroupnav.php:97
+#, php-format
+msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/personal.php:81
-msgid "Your sent messages"
+#: lib/subgroupnav.php:104
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/settingsaction.php:99
-msgid "Twitter"
+#: lib/subs.php:53
+msgid "User has blocked you."
 msgstr ""
 
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr ""
 
-#: lib/util.php:1718
-msgid "To"
+#: lib/tagcloudsection.php:56
+msgid "None"
 msgstr ""
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr ""
+
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "No such user."
+
+#: 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 "Create new account"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Couldn’t confirm e-mail."
+
+#~ msgid "Email address"
+#~ msgstr "E-mail address"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Error inserting notice"
+
+#~ 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."
diff --git a/locale/es/LC_MESSAGES/laconica.mo b/locale/es/LC_MESSAGES/laconica.mo
index fa655909f..a74ae65c4 100644
--- a/locale/es/LC_MESSAGES/laconica.mo
+++ b/locale/es/LC_MESSAGES/laconica.mo
diff --git a/locale/es/LC_MESSAGES/laconica.po b/locale/es/LC_MESSAGES/laconica.po
index 4cc5a0719..fdad2814e 100644
--- a/locale/es/LC_MESSAGES/laconica.po
+++ b/locale/es/LC_MESSAGES/laconica.po
@@ -3,49 +3,112 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-01-29 17:57+0000\n"
+"Last-Translator: Paula Salazar <psalazar@cmet.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr "Busca \"%s\" en el Corriente"
+msgstr "Busca \"%s\" en la Corriente"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../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."
+" 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/subscribe.php:84
+#: ../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
+#, fuzzy, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s te ha invitado a unirte a ellos en %2$s"
+
+#: ../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 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 probar el servicio, cliquea el enlace debajo para aceptar la "
+"invitación.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Si no, puedes ignorar este mensaje. Gracias por tu paciencia y tiempo.\n"
+"\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"
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -62,405 +125,822 @@ msgstr ""
 "Atentamente,\n"
 "%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../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/publicrss.php:60
+#: ../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 "Flujo público de %s"
+msgstr "Corriente pública de %s"
 
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#: ../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 y amigos"
 
-#: ../lib/util.php:233
+#: ../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"
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#, php-format
+msgid "%s status"
+msgstr "estado 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/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, 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.)"
+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
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** es un servicio de microblogueo de "
-"[%%site.broughtby%%**](%%site.broughtbyurl%%)."
+"**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%"
+"site.broughtbyurl%%)."
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** es un servicio de microblogueo."
 
-#: ../lib/util.php:250
+#: ../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/register.php:176
+#: 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"
+"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/register.php:178
+#: ../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:165
+#: ../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/imsettings.php:188
+#: ../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."
+"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."
 
-#: ../lib/util.php:296
+#: ../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 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
+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 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/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 "¡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/twitapilaconica.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:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "Añadir OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../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/showstream.php:254
+#: ../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/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:422
 msgid "All subscriptions"
 msgstr "Todas las suscripciones"
 
-#: ../actions/publicrss.php:62
+#: ../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:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, 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:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "¡Ya está suscrito!"
 
-#: ../actions/userauthorization.php:76
+#: ../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?"
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
+#: actions/userauthorization.php:81
 msgid "Authorize subscription"
 msgstr "Autorizar la suscripción"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
 "compartidos! "
 
-#: ../actions/avatar.php:32
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+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/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/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "Avatar actualizado"
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "A la espera de una confirmación para esta dirección. Busca en tu cuenta "
-"Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu "
-"lista de amigos?)"
+"Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu lista "
+"de amigos?)"
 
-#: ../lib/util.php:1136
+#: ../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."
+
+#: ../lib/util.php:1318 lib/util.php:1452
+#, fuzzy
 msgid "Before »"
-msgstr "Antes"
+msgstr "Antes »"
 
-#: ../actions/profilesettings.php:52
+#: ../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:93 ../actions/updateprofile.php:102
+#: ../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)."
 
-#: ../actions/updateprofile.php:118
+#: ../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'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+#: ../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/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../lib/openid.php:121
+#: ../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/imsettings.php:154
+#: ../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/password.php:45
+#: ../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/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "Cambiar"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr "Cambiar el manejo del correo."
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+msgid "Change your password"
+msgstr "Cambia tu contraseña"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: lib/accountsettingsaction.php:105
+msgid "Change your profile settings"
+msgstr "Cambia tus opciones de perfil"
+
+#: ../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/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Confirmar la dirección"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "Confirmación cancelada."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr "Código de confirmación"
+
+#: ../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/finishopenidlogin.php:91
+#: ../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/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "Conectarse"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "Conectarse a una cuenta existente"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Ponerse en contacto"
 
-#: ../lib/openid.php:178
+#: ../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"
 
-#: ../lib/openid.php:160
+#: ../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 "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."
+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:161
+#: ../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/updateprofile.php:154
+#: ../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/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "No se pudo confirmar el correo electrónico."
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#, 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 señales de petición a señales de acceso."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "No se pudo crear la suscripción."
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../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."
 
-#: ../actions/unsubscribe.php:56
+#: ../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."
 
-#: ../actions/remotesubscribe.php:125
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:84
+msgid "Couldn't find any statuses."
+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/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: 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:175
+#: ../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/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Crear"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "Crear una nueva cuenta"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../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/imsettings.php:45
+#: ../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/showstream.php:337
+#: ../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/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/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
 msgstr "Actualmente"
 
-#: ../lib/util.php:893
+# '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"
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Error de BD al insertar respuesta: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../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:181
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Dirección de 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/profilesettings.php:102 ../actions/register.php:63
+#: ../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:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
-msgstr "Confirmacion de correo electronico"
+msgstr "Confirmación de correo electrónico"
 
-#: ../actions/recoverpassword.php:176
+#: ../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/userauthorization.php:136
+#: ../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 señal"
+msgstr "Error al autorizar código"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../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: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/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Error al insertar aviso"
-
 #: ../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:201
+#: ../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:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
 msgid "Error saving remote profile"
 msgstr "Error al guardar perfil remoto"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../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:237 lib/openid.php:246
 msgid "Error saving the user."
 msgstr "Error al guardar el usuario."
 
-#: ../actions/password.php:80
+#: ../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/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 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/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
 msgid "Error updating profile"
 msgstr "Error al actualizar el perfil"
 
 #: ../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/recoverpassword.php:79
+#: ../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/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "Apodo existente"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "Preguntas Frecuentes"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "Error al actualizar avatar."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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 de los amigos de %s"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../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 de respuestas a %s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, 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."
@@ -468,39 +948,68 @@ 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/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:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "Portada"
 
-#: ../actions/profilesettings.php:49
+#: ../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/profilesettings.php:87
+#: ../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 es un URL válido."
 
-#: ../actions/imsettings.php:61
+#: ../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"
+
+#: ../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 "Dirección de mensajería instantánea"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "Configuración de mensajería instantánea"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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."
@@ -516,23 +1025,36 @@ msgstr ""
 "Si quieres agregar una cuenta OpenID, ponla en el campo de abajo y haz clic "
 "en \"Añadir\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"Si olvidaste o perdiste tu contraseña, puedes recibir una nueva en la "
-"dirección de correo electrónico que usaste para registrar tu cuenta."
+"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/password.php:69
+#: ../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/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:443
+msgid "Incoming email address removed."
+msgstr "Dirección de correo entrante removida."
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153
 msgid "Incorrect old password"
 msgstr "Contraseña antigua incorrecta."
 
-#: ../actions/login.php:63
+#: ../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/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -540,71 +1062,107 @@ msgstr ""
 "Se enviaron instrucciones para recuperar tu contraseña a la dirección de "
 "correo registrada."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "El URL del avatar '%s' es inválido"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Dirección de correo electrónico inválida: %s"
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "El sitio '%s' es inválido"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "El URL de la licencia '%s' es inválido"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
 msgid "Invalid notice content"
 msgstr "El contenido del aviso es inválido"
 
-#: ../actions/postnotice.php:67
+#: ../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/postnotice.php:72
+#: ../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/updateprofile.php:86
+#: ../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/remotesubscribe.php:96
+#: ../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/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:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Tamaño inválido."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
 msgid "Invalid username or password."
 msgstr "Usuario o contraseña inválidos."
 
-#: ../lib/util.php:237
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 "Usa el software de microblogueo [Laconica](http://laconi.ca), versión %s, "
-"disponible bajo la [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"disponible bajo la [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../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/imsettings.php:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -614,343 +1172,628 @@ msgstr ""
 "Primero, asegúrate de agregar a %s a tu lista de amigos en tu cliente de "
 "mensajería instantánea o en GTalk."
 
-#: ../actions/profilesettings.php:55
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:128
+msgid "Language"
+msgstr "Idioma"
+
+#: ../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/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/profilesettings.php:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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/login.php:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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/openidlogin.php:44
+#: ../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/login.php:122
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
-"Inicia una sesión con tu usuario y contraseña. ¿Aún no tienes usuario? "
-"[Crea](%%action.register%%) una cuenta nueva o prueba [OpenID] "
-"(%%action.openidlogin%%). "
+"Inicia una sesión con tu usuario y contraseña. ¿Aún no tienes usuario? [Crea]"
+"(%%action.register%%) una cuenta nueva o prueba [OpenID] (%%action."
+"openidlogin%%). "
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Salir"
 
-#: ../actions/login.php:106
+#: ../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/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/showstream.php:281
+#: ../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/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/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:480
 msgid "Member since"
 msgstr "Miembro desde"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog por %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 ""
+"Carrier de celular para tu teléfono. Si conoces un carrier que acepte SMS "
+"sobre correo electrónico pero no está listado aquí, envíanos un correo para "
+"hacérnoslo saber a %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 "Mi texto y archivos están disponibles bajo"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../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"
+
+#: ../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/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/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+#: actions/finishopenidlogin.php:99
 msgid "New nickname"
 msgstr "Nuevo apodo"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "Nuevo aviso"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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/recoverpassword.php:275
+#: ../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/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../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/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59
+#: ../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/finishopenidlogin.php:165 ../actions/profilesettings.php:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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 ""
 "El apodo debe tener solamente letras minúsculas y números y no puede tener "
 "espacios. "
 
-#: ../actions/finishopenidlogin.php:170
+#: ../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: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:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "Apodo o correo electrónico"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
+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/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "¡Ninguna petición de autorización!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+#: actions/smssettings.php:299
+msgid "No carrier selected."
+msgstr "Ningún carrier seleccionado."
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+#: actions/smssettings.php:486
+msgid "No code entered"
+msgstr "No ingresó código"
+
+#: ../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:49
+#: ../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/userbyid.php:27
+#: ../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:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
 msgstr "Ningún apodo."
 
-#: ../actions/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: 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/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/recoverpassword.php:189
+#: ../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/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
 msgid "No request found!"
 msgstr "¡Ninguna petición encontrada!"
 
 #: ../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/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "Ningún tamaño."
 
-#: ../actions/openidsettings.php:135
+#: ../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/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/openidsettings.php:135 actions/openidsettings.php:144
+#: actions/openidsettings.php:222
 msgid "No such OpenID."
 msgstr "No existe esa cuenta OpenID."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "No existe ese documento."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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 existe ese aviso."
 
-#: ../actions/recoverpassword.php:56
+#: ../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: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:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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."
 
-#: ../lib/gallery.php:76
+#: ../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 a mostrar!"
+msgstr "¡Nadie para mostrar!"
 
-#: ../actions/recoverpassword.php:60
+#: ../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."
 
-#: ../actions/imsettings.php:158
+#: ../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
-#, fuzzy
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"La cuenta OpenID no es válida\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "La cuenta OpenID no es válida."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../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ónica 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:83 ../actions/register.php:61
+#: ../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:118
+#: ../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/remotesubscribe.php:111
+#: ../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/remotesubscribe.php:104
+#: ../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/avatar.php:95
+#: ../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/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "No autorizado."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "¡Respuesta inesperada!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:309
+msgid "Not found"
+msgstr "No encontrado"
+
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
+#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
+#: ../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/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "¡No estás suscrito!"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Búsqueda de avisos"
+
+#: ../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 de avisos de %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:94
 msgid "Notice has no profile"
 msgstr "Aviso sin perfil"
 
-#: ../actions/showstream.php:297
+#: ../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/password.php:39
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "Antigua contraseña"
 
-#: ../lib/util.php:288
+#: ../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: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: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/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:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Error OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "Configuración OpenID"
 
-#: ../actions/avatar.php:84
+#: ../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/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "Carga parcial."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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/recoverpassword.php:249
+#: ../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/recoverpassword.php:245
+#: ../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/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../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/password.php:89 ../actions/recoverpassword.php:274
+#: ../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 "Contraseña guardada"
 
-#: ../actions/password.php:61 ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Gente"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Búsqueda de gente"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Buscador de gente"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "Personal"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr "Mensaje Personal"
+
+#: ../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/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, "
@@ -960,91 +1803,156 @@ msgstr ""
 "avisos de este usuario. Si no pediste esta suscripción, haz clic en "
 "\"Cancelar\"."
 
-#: ../actions/imsettings.php:74
+#: ../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/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "Preferencias guardadas."
 
-#: ../lib/util.php:300
+#: ../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"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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/stream.php:54
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "URL del perfil"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
 msgstr "Configuración del perfil"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Público"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Feed del flujo público"
 
-#: ../actions/public.php:33
+#: ../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/recoverpassword.php:151
+#: ../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:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+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:141
+#: ../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:67
+#: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr "Código de recuperación para usuario desconocido."
 
-#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: 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/userauthorization.php:119
+#: ../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/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr "Registro exitoso."
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "Rechazar"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../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/updateprofile.php:69
+#: ../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/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "Subscripción remota"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: 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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "Eliminar OpenID"
 
@@ -1056,40 +1964,82 @@ msgstr ""
 "¡Si eliminas tu único OpenID no podrás volver a entrar! Si necesitas "
 "eliminarlo, agrega otro antes."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
 msgid "Replies"
 msgstr "Respuestas"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../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/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "Restablecer"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "Restablecer contraseña"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr "Número telefónico para sms"
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Preferencias SMS"
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr "SMS confirmación"
+
+#: ../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/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../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: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"
 
-#: ../lib/searchaction.php:73 ../lib/util.php:277
+#: ../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/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "Feed del flujo de búsqueda"
 
-#: ../actions/noticesearch.php:30
+#: ../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 "
@@ -1105,159 +2055,293 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 "Buscar personas en %%site.name%% por nombre, ubicación o intereses. Separa "
-"los términos con espacios; deben tener una longitud mínima de 3 "
-"caracteres."
+"los términos con espacios; deben tener una longitud mínima de 3 caracteres."
 
-#: ../lib/util.php:982
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: actions/smssettings.php:457
+msgid "Select a carrier"
+msgstr "Seleccione un operador"
+
+#: ../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/imsettings.php:71
+#: ../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"
 
-#: ../lib/util.php:282
+#: ../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 avisos por SMS; Yo acepto que puede incurrir en grandes cobros por "
+"mi operador de telefonía "
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"Envirame replicas 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:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "Configuración guardada."
 
-#: ../actions/finishaddopenid.php:66
+#: ../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ó."
 
-#: ../lib/util.php:302
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Lo sentimos, pero el email de entrada no está permitido"
+
+#: ../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 email de entrada."
+
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
 msgid "Source"
 msgstr "Fuente"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../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/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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/showstream.php:294 ../actions/subscribers.php:27
+#: ../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/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "Suscripción autorizada"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "Suscripción rechazada"
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../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/avatar.php:87
+#: ../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/noticesearch.php:34
+#: ../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 "Etiquetas"
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr "Texto"
+
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:67
 msgid "Text search"
 msgstr "Búsqueda de texto"
 
-#: ../actions/openidsettings.php:140
+#: ../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/confirmaddress.php:52
+#: ../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/confirmaddress.php:43
+#: ../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/avatar.php:80
+#: ../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/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "Ese archivo es demasiado grande."
 
-#: ../actions/imsettings.php:161
+#: ../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/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr "Esa ya es su dirección de correo electrónico"
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+msgstr "Ese ya es su número telefónico"
+
+#: ../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/imsettings.php:201
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:397
+msgid "That is not your email address."
+msgstr "Esa no es su dirección de correo electrónico"
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+#: actions/smssettings.php:393
+msgid "That is not your phone number."
+msgstr "Ese no es su número telefónico"
+
+#: ../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/newnotice.php:52
+#: ../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/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 pertenece ya a otro usuario"
+
+#: ../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/confirmaddress.php:86
+#: ../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/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "La dirección \"%s\" fue confirmada para tu cuenta."
 
-#: ../actions/imsettings.php:241
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: 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:311
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 "Se ha autorizado la suscripción, pero no se ha enviado un URL de retorno. "
-"Lee de nuevo las instrucciones para saber cómo autorizar la suscripción. "
-"Tu identificador de suscripción es:"
+"Lee de nuevo las instrucciones para saber cómo autorizar la suscripción. Tu "
+"identificador de suscripción es:"
 
-#: ../actions/userauthorization.php:321
+#: ../actions/userauthorization.php:322
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"Se ha rechazado la suscripción, pero no se ha enviado un URL de retorno. "
-"Lee de nuevo las instrucciones para saber cómo rechazar la suscripción "
+"Se ha rechazado la suscripción, pero no se ha enviado un URL de retorno. Lee "
+"de nuevo las instrucciones para saber cómo rechazar la suscripción "
 "completamente."
 
-#: ../actions/subscribers.php:35
+#: ../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/subscribers.php:33
+#: ../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/subscriptions.php:35
+#: ../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."
 
-#: ../actions/subscriptions.php:33
+#: ../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."
 
-#: ../actions/recoverpassword.php:87
+#: ../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/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."
+"Este código de confirmación es demasiado viejo. Por favor empieza de nuevo."
 
 #: ../lib/openid.php:195
 msgid ""
@@ -1267,7 +2351,8 @@ 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: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 "
@@ -1278,44 +2363,90 @@ msgstr ""
 "OpenID a una cuenta local. Puedes crear una nueva o conectarte con la tuya, "
 "si la tienes."
 
-#: ../lib/util.php:147
+#: ../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 POST o DELETE"
+
+#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
+#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
+#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
+#: actions/twitapistatuses.php:303 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 "Esta página no está disponible en un tipo de media que aceptes."
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138
+msgid "Timezone"
+msgstr "Zona horaria"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr "Zona horaria no seleccionada"
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 "Para suscribirte, puedes [iniciar una sesión](%%action.login%%), o "
 "[registrar](%%action.register%%) una nueva cuenta. Si ya tienes una en un "
 "[servicio de microblogueo compatible](%%doc.openmublog%%), escribe el URL de "
 "tu perfil debajo."
 
-#: ../actions/profilesettings.php:51
+#: ../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 personal, blog o perfil en otro sitio"
 
-#: ../actions/remotesubscribe.php:74
+#: ../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/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../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."
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323
 msgid "Unexpected password reset."
 msgstr "Restablecimiento de contraseña inesperado."
 
+#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+msgid "Unknown action"
+msgstr "Acción desconocida"
+
 #: ../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."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1323,24 +2454,52 @@ msgstr ""
 "A menos que se especifique lo contrario, el contenido de este sitio es "
 "propiedad de sus colaboradores y está disponible bajo la"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Tipo de dirección %s desconocida"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Cancelar suscripción"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../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/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr "Formato de imagen no soportado."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr "Actualizaciones por sms"
+
+#: ../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/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:129
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "Cargar"
 
@@ -1353,114 +2512,217 @@ msgid ""
 msgstr ""
 "Carga un nuevo \"avatar\" (imagen de usuario) aquí. No puedes editar la "
 "imagen una vez cargada, por lo que antes debes asegurarte que sea más o "
-"menos cuadrada. Además, debe estar bajo la misma licencia del sitio. Usa "
-"una foto que te pertenezca y que quieras compartir."
+"menos cuadrada. Además, debe estar bajo la misma licencia del sitio. Usa una "
+"foto que te pertenezca y que quieras compartir."
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr "Cargar una nueva imagen de perfil"
+
+#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Usa este formulario para invitar a tus amigos y colegas a usar este "
+"servicio."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
-"Usado sólo para actualizaciones, anuncios y recuperación de "
-"contraseñas"
+"Usado sólo para actualizaciones, anuncios y recuperación de contraseñas"
 
 #: ../actions/finishremotesubscribe.php:86
+#: 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:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../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:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "Apodo del usuario"
 
-#: ../lib/util.php:969
+#: ../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
 #, php-format
 msgid "What's up, %s?"
 msgstr "¿Qué tal, %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../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/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipo de imagen incorrecto para '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Tamaño de imagen incorrecto para '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../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 "¡Ya tienes este OpenID!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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 "¡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 ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Puedes cambiar tu contraseña aquí. ¡Elige una buena!"
 
-#: ../actions/register.php:164
+#: ../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/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/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Puedes eliminar un OpenID de tu cuenta haciendo clic en el botón "
-"\"Eliminar\"."
+"Puedes eliminar un OpenID de tu cuenta haciendo clic en el botón \"Eliminar"
+"\"."
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
 "Puedes enviar y recibir avisos vía [mensajes instantáneos](%%doc.im%%) de "
 "Jabber/GTalk. Configura tu dirección y opciones debajo."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 "Puedes actualizar la información de tu perfil personal para que la gente "
 "sepa más sobre ti."
 
 #: ../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:51
+#: ../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/updateprofile.php:62
+#: ../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/recoverpassword.php:134
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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 "Te has identificado. Escribe una nueva contraseña a continuación."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "El URL de tu OpenID"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Tu nombre de usuario en este servidor, o la dirección de correo "
-"electrónico registrada."
+"Tu nombre de usuario en este servidor, o la dirección de correo electrónico "
+"registrada."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -1471,1369 +2733,2230 @@ msgstr ""
 "[OpenID](%%doc.openid%%) te permite ingresar a muchos sitios con la misma "
 "cuenta de usuario. Puedes administrar tus OpenID asociados desde aquí."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "hace unos segundos"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "hace %d días"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "hace %d horas"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr "hace %d minutos"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr "hace %d meses"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "hace un día"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "hace un minuto"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "hace un mes"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "hace un año"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "hace una hora"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "responder"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "repita la contraseña anterior"
 
-#: ../lib/util.php:1127
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:555
+msgid "unsupported file type"
+msgstr "tipo de fichero no soportado"
+
+#: ../lib/util.php:1309 lib/util.php:1443
+#, fuzzy
 msgid "« After"
 msgstr "« Después"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
+#: 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/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: 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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
+msgid "%s favorite notices"
 msgstr ""
 
-#: ../actions/invite.php:168 actions/invite.php:176
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
+msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+#: 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:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
+#: actions/login.php:122 actions/login.php:264
+msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
+#: actions/login.php:126 actions/login.php:268
+msgid "Login with your username and password. "
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
+#: 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/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
+#: 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/register.php:213
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+msgid "No such user"
 msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
+#: actions/newmessage.php:117 actions/newmessage.php:67
+msgid "New message"
 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/noticesearch.php:95 actions/noticesearch.php:146
+msgid "Notice without matching profile"
 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/openidsettings.php:28 actions/openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+#: actions/outbox.php:53 actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+"Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
+msgid "You can update your personal profile info here "
 msgstr ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
+#: 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/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+msgid "This confirmation code is too old. "
 msgstr ""
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
 msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
 msgstr ""
 
-#: ../actions/register.php:202
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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...\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."
+"want to..."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: 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 "Could not follow user: %s is already on your list."
+msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
 msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
+#: actions/showstream.php:154
+msgid "Send a message"
 msgstr ""
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, php-format
+msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#, php-format
+msgid "Direct messages to %s"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
+msgid "No message text!"
 msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
+#: 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/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
-msgid "Feed for tag %s"
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
+#: 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 ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
+#: 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 ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+msgid "Twitter settings"
 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/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+msgid "Current verified Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
 msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
 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/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
+msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+msgid "Twitter settings saved."
 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/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
+msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
+#: 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/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+msgid "Twitter preferences saved."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
+msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
+msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+msgid "Command results"
 msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
+#: classes/Command.php:96 classes/Command.php:113
+#, php-format
+msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
+msgid "User has no last notice"
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
+#: classes/Command.php:146 classes/Command.php:166
+msgid "Notice marked as fave."
 msgstr ""
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
-msgid "Notices tagged with %s"
+msgid "Homepage: %s"
 msgstr ""
 
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
 msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
+#: classes/Command.php:295 classes/Command.php:335
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: 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:28 actions/register.php:28
-msgid "Registration not allowed."
+#: classes/Command.php:313 classes/Command.php:356
+msgid "Notification off."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
+#: classes/Message.php:53 classes/Message.php:56
+msgid "Could not insert message."
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
+#: classes/Message.php:63 classes/Message.php:66
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
 msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: lib/mail.php:253 lib/mail.php:512
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: lib/mailbox.php:43 lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: lib/openid.php:195 lib/openid.php:203
+msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+msgid "Favorites"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
 msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
 msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
+msgid "Twitter"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
+msgid "Twitter integration options"
 msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+msgid "Could not parse message."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s y amigos"
+
+#: actions/avatarsettings.php:76
+msgid "You can upload your personal avatar."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Configuración"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "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 ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
 msgstr ""
 
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
+#: actions/avatarsettings.php:334 actions/grouplogo.php:391
+#: classes/User_group.php:112
+#, fuzzy
+msgid "Lost our file."
+msgstr "No existe ese aviso."
+
+#: 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 fichero no soportado"
+
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "No existe ese usuario."
+
+#: actions/block.php:129
+msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/block.php:162
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "¡Ya te has conectado!"
+
+#: actions/block.php:167
+msgid "Failed to save block information."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/confirmaddress.php:159
+#, fuzzy, php-format
+msgid "The address \"%s\" has been "
+msgstr "La dirección fue eliminada."
+
+#: actions/deletenotice.php:73
+#, fuzzy
+msgid "You are about to permanently delete a notice. "
+msgstr "¿Estás seguro de que quieres eliminar este aviso?"
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
 #, php-format
-msgid "Updates from %1$s on %2$s!"
+msgid "Edit %s group"
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: 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/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: 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 "Ningún apodo."
+
+#: 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 aviso."
+
+#: 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:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
 msgstr ""
+"El apodo debe tener solamente letras minúsculas y números y no puede tener "
+"espacios. "
 
-#: ../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/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "La biografía es demasiado larga (máx. 140 caracteres)."
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "No se pudo actualizar el usuario."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "Configuración guardada."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Esperando confirmación de este número de teléfono."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+#: actions/emailsettings.php:321
+#, fuzzy
+msgid "That email address already belongs "
+msgstr "La dirección de correo electrónico ya existe."
+
+#: actions/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
 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."
 
-#: ../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/facebookhome.php:110
+msgid "Server error - couldn't get user!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: actions/facebookhome.php:196
+#, php-format
+msgid "If you would like the %s app to automatically update "
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "Allow %s to update my Facebook status"
 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!"
+#: actions/facebookhome.php:218
+msgid "Skip"
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/facebookhome.php:235
+#, fuzzy
+msgid "No notice content!"
+msgstr "¡Ningún contenido!"
+
+#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+msgid "Pagination"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
+#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#, fuzzy
+msgid "After"
+msgstr "« Después"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#, fuzzy
+msgid "Before"
+msgstr "Antes"
+
+#: actions/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
+#: actions/facebookinvite.php:72
+#, fuzzy
+msgid "Invitations have been sent to the following users:"
+msgstr "Invitacion(es) enviada(s) a las siguientes personas:"
+
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
 msgstr ""
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "Feed de los amigos de %s"
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
 msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Favor"
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "No se pudo actualizar el usuario."
+
+#: actions/facebooksettings.php:65
+msgid "There was a problem saving your sync preferences!"
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Preferencias guardadas."
+
+#: actions/facebooksettings.php:90
+msgid "Automatically update my Facebook status with my notices."
 msgstr ""
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Perfil"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Preferencias"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#, php-format
-msgid "%s favorite notices"
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+#, fuzzy
+msgid "Popular notices"
+msgstr "No existe ese aviso."
+
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "No existe ese aviso."
+
+#: actions/favorited.php:79
+#, fuzzy
+msgid "The most popular notices on the site right now."
+msgstr "Mostrando los tags más populares de la última semana"
+
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/featured.php:71
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid "Featured users, page %d"
 msgstr ""
 
-#: actions/inbox.php:28
+#: actions/featured.php:99
 #, php-format
-msgid "Inbox for %s - page %d"
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/inbox.php:30
-#, php-format
-msgid "Inbox for %s"
+#: actions/finishremotesubscribe.php:188
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/groupbyid.php:79
+msgid "No ID"
 msgstr ""
 
-#: actions/invite.php:178
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+msgid "Group logo"
 msgstr ""
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Avatar actualizado"
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Error al actualizar avatar."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: actions/login.php:126
-msgid "Login with your username and password. "
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/newmessage.php:65
-msgid "No recipient specified."
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: actions/groups.php:90
+#, 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
+#, fuzzy
+msgid "Create a new group"
+msgstr "Crear una nueva cuenta"
+
+#: actions/groupsearch.php:57
+#, fuzzy, php-format
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Search for groups on %%site.name%% by their name, location, or description. "
 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/newmessage.php:108
-msgid "No such user"
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "Buscador de gente"
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
 msgstr ""
 
-#: actions/newmessage.php:117
-msgid "New message"
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
 msgstr ""
 
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
+#: actions/imsettings.php:147
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk "
+msgstr "Enviarme avisos por Jabber/GTalk"
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Ningún código de confirmación."
+
+#: actions/joingroup.php:65
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/openidsettings.php:28
+#: actions/joingroup.php:95
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "¡Ya te has conectado!"
+
+#: actions/joingroup.php:128
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "No puede seguir al usuario. Usuario no encontrado"
+
+#: actions/joingroup.php:135
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgid "%s joined group %s"
 msgstr ""
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/leavegroup.php:65
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "No existe ese aviso."
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "No nos enviaste ese perfil"
+
+#: actions/leavegroup.php:100
+msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/outbox.php:28
+#: actions/leavegroup.php:130
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "No se pudo actualizar información de usuario"
+
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "No puede seguir al usuario. Usuario no encontrado"
+
+#: actions/leavegroup.php:145
 #, php-format
-msgid "Outbox for %s - page %d"
+msgid "%s left group %s"
 msgstr ""
 
-#: actions/outbox.php:30
-#, php-format
-msgid "Outbox for %s"
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
 msgstr ""
 
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
+#: actions/newgroup.php:177
+#, fuzzy
+msgid "Could not create group."
+msgstr "No se pudo guardar la información del avatar"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "No se pudo crear la suscripción."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "Ese archivo es demasiado grande."
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "Avisos"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
 msgstr ""
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
+# ¿zumbido? creo que así lo traduce msn
+#: actions/nudge.php:97
+#, fuzzy
+msgid "Nudge sent!"
+msgstr "¡Zumbido enviado!"
+
+#: actions/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "Ingreso desde una cuenta OpenID"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Eliminar OpenID"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Configuración"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
 msgstr ""
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "Buscar"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Cambia tu contraseña"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "Contraseña guardada"
+
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Correo electrónico no válido"
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: actions/register.php:216
+#: actions/peopletag.php:91
 #, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "Perfil desconocido"
+
+#: actions/profilesettings.php:124
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/profilesettings.php:144
+#, fuzzy
+msgid "Automatically subscribe to whoever "
+msgstr ""
+"Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor "
+"para no-humanos)"
+
+#: actions/profilesettings.php:229 actions/tagother.php:176
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "El sitio '%s' es inválido"
+
+#: actions/profilesettings.php:311
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "No se pudo guardar el perfil."
+
+#: actions/public.php:107
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Línea temporal pública"
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: actions/public.php:220
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
 
-#: actions/showfavorites.php:61
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Feed del flujo público"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Feed for favorites of %s"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/showmessage.php:33
-msgid "No such message."
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/register.php:149
+#, fuzzy
+msgid "You can't register if you don't "
+msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
+
+#: actions/register.php:286
+msgid "With this form you can create "
 msgstr ""
 
-#: actions/showmessage.php:61
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: actions/register.php:368
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, "
 msgstr ""
+"1-64 letras en minúscula o números, sin signos de puntuación o espacios"
 
-#: actions/showmessage.php:66
-#, php-format
-msgid "Message from %1$s on %2$s"
+#: actions/register.php:382 actions/register.php:386
+#, fuzzy
+msgid "Used only for updates, announcements, "
 msgstr ""
+"Usado sólo para actualizaciones, anuncios y recuperación de contraseñas"
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/register.php:398
+#, fuzzy
+msgid "URL of your homepage, blog, "
+msgstr "El URL de tu página personal, blog o perfil en otro sitio"
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Cuéntanos algo sobre ti y tus intereses en 140 caracteres"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
 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/smssettings.php:312
+#: actions/register.php:471
 #, php-format
-msgid "Mobile carrier for your phone. "
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
-#, php-format
-msgid "Direct messages to %s"
+#: actions/register.php:495
+msgid "(You should receive a message by email "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: 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 "Respuestas a %s"
+
+#: actions/showfavorites.php:79
 #, php-format
-msgid "All the direct messages sent to %s"
+msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/showgroup.php:79
 #, php-format
-msgid "All the direct messages sent from %s"
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
+#: actions/showgroup.php:206
+#, fuzzy
+msgid "Group profile"
+msgstr "No existe ese aviso."
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#, fuzzy
+msgid "Note"
+msgstr "Avisos"
+
+#: actions/showgroup.php:270
+msgid "Group actions"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Feed de avisos de %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
+msgid "Members"
+msgstr "Miembro desde"
+
+#: 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/twitapifavorites.php:92
-#, php-format
-msgid "%s / Favorites from %s"
+#: actions/showgroup.php:370
+msgid "All members"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/showgroup.php:378
 #, php-format
-msgid "%s updates favorited by %s / %s."
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#, php-format
-msgid "%s added your notice as a favorite"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/showstream.php:73
 #, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+msgid "%s, page %d"
 msgstr ""
 
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Perfil"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "El usuario no tiene un perfil."
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
 msgstr ""
 
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
+#: actions/showstream.php:317
+#, fuzzy
+msgid "User actions"
+msgstr "Acción desconocida"
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
 msgstr ""
 
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
+#: actions/showstream.php:343
+msgid "Message"
 msgstr ""
 
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Suscriptores"
+
+#: actions/showstream.php:533
+msgid "All groups"
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: 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 "
 msgstr ""
 
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
+#: actions/smssettings.php:128
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, "
+msgstr "Número telefónico, sin puntuación ni espacios, incluya código de área"
+
+#: actions/smssettings.php:162
+#, fuzzy
+msgid "Send me notices through SMS; "
+msgstr "Enviarme avisos por Jabber/GTalk"
+
+#: actions/smssettings.php:335
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. "
+msgstr "Esperando confirmación de este número de teléfono."
+
+#: actions/smssettings.php:453
+#, fuzzy
+msgid "Mobile carrier"
+msgstr "Seleccione un operador"
+
+#: actions/subedit.php:70
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "No nos enviaste ese perfil"
+
+#: actions/subedit.php:83
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "No se pudo crear la suscripción."
+
+#: actions/subscribe.php:55
+#, fuzzy
+msgid "Not a local user."
+msgstr "No existe ese usuario."
+
+#: actions/subscribe.php:69
+#, fuzzy
+msgid "Subscribed"
+msgstr "Suscribirse"
+
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Suscriptores"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/subscribers.php:63
+#, fuzzy
+msgid "These are the people who listen to "
+msgstr "Estas son las personas que escuchan los avisos de %s."
+
+#: actions/subscribers.php:67
+#, fuzzy, php-format
+msgid "These are the people who "
+msgstr "Estas son las personas que escuchan los avisos de %s."
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Todas las suscripciones"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Todas las suscripciones"
+
+#: actions/subscriptions.php:65
+#, fuzzy
+msgid "These are the people whose notices "
+msgstr "Estas son las personas que %s escucha."
+
+#: actions/subscriptions.php:69
+#, fuzzy, php-format
+msgid "These are the people whose "
+msgstr "Estas son las personas que escuchan los avisos de %s."
+
+#: actions/subscriptions.php:122
+#, fuzzy
+msgid "Jabber"
+msgstr "Ningún Jabber ID."
+
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Avisos marcados con %s"
+
+#: actions/tag.php:66
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
 
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
+#: actions/tagother.php:33
+#, fuzzy
+msgid "Not logged in"
+msgstr "No conectado."
+
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No id argument."
+msgstr "No existe ese documento."
+
+#: actions/tagother.php:65
+#, php-format
+msgid "Tag %s"
 msgstr ""
 
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
+#: actions/tagother.php:141
+msgid "Tag user"
 msgstr ""
 
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
+#: actions/tagother.php:149
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/tagother.php:164
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/tagother.php:191
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
+#: actions/tagother.php:198
+#, fuzzy
+msgid "Could not save tags."
+msgstr "No se pudo guardar la información del avatar"
+
+#: actions/tagother.php:233
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "No existe ese aviso."
+
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Microblog por %s"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "¡Ninguna petición encontrada!"
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Nueva contraseña"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
 msgstr ""
 
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
+#: actions/twittersettings.php:341
+#, fuzzy, php-format
+msgid "Unable to retrieve account information "
+msgstr "No se pudo eliminar la confirmación de correo electrónico."
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Error al guardar el usuario."
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Ningun URL de perfil devuelto por el servidor."
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Perfil remoto sin perfil coincidente"
+
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Cancelar suscripción"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
 msgstr ""
 
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Hubo un problema al guardar el aviso."
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Error al actualizar avatar."
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
 msgstr ""
 
-#: classes/Channel.php:113
-msgid "Command results"
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
 msgstr ""
 
-#: classes/Channel.php:148
-msgid "Command complete"
+#: lib/action.php:130
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
+
+#: lib/action.php:145
+msgid "Untitled page"
 msgstr ""
 
-#: classes/Channel.php:158
-msgid "Command failed"
+#: lib/action.php:316
+msgid "Primary site navigation"
 msgstr ""
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: classes/Command.php:96
-#, php-format
-msgid "Subscriptions: %1$s\n"
+#: lib/action.php:325
+msgid "Search for people or text"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "Acerca de"
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "Cambia tu contraseña"
+
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
+#: lib/action.php:332
+msgid "Logout from the site"
 msgstr ""
 
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
+#: lib/action.php:335
+msgid "Login to the site"
 msgstr ""
 
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Crear una nueva cuenta"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "No existe esa cuenta OpenID."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Ayuda"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "Nuevo aviso"
+
+#: lib/action.php:417
+msgid "Local views"
 msgstr ""
 
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "Nuevo aviso"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Suscripciones"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
 msgstr ""
 
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
+#: lib/action.php:630
+msgid "All "
 msgstr ""
 
-#: classes/Command.php:178
-#, php-format
-msgid "About: %s"
+#: lib/action.php:635
+msgid "license."
 msgstr ""
 
-#: classes/Command.php:200
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "No existe ese usuario."
+
+#: lib/blockform.php:153
+msgid "Block"
+msgstr "Bloquear"
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
 msgstr ""
 
-#: classes/Command.php:214
+#: lib/facebookaction.php:268
 #, php-format
-msgid "Direct message to %s sent"
+msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: classes/Command.php:216
-msgid "Error sending direct message."
+#: lib/facebookaction.php:271
+#, fuzzy
+msgid " a new account."
+msgstr "Crear una nueva cuenta"
+
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#, fuzzy
+msgid "Published"
+msgstr "Público"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
+msgid "Favor this notice"
+msgstr "No existe ese aviso."
+
+#: lib/feedlist.php:64
+msgid "Export data"
 msgstr ""
 
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
+#: lib/galleryaction.php:121
+msgid "Filter tags"
 msgstr ""
 
-#: classes/Command.php:270
-#, php-format
-msgid "Subscribed to %s"
+#: lib/galleryaction.php:131
+msgid "All"
 msgstr ""
 
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
+#: lib/galleryaction.php:137
+msgid "Tag"
 msgstr ""
 
-#: classes/Command.php:295
-#, php-format
-msgid "Unsubscribed from %s"
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
+#: lib/galleryaction.php:139
+msgid "Go"
 msgstr ""
 
-#: classes/Command.php:313
-msgid "Notification off."
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "El URL de tu página personal, blog o perfil en otro sitio"
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Suscripciones"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Cuéntanos algo sobre ti y tus intereses en 140 caracteres"
+
+#: lib/groupeditform.php:158
+#, fuzzy
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
 msgstr ""
 
-#: classes/Command.php:315
-msgid "Can't turn off notification."
+#: lib/groupnav.php:100
+msgid "Admin"
 msgstr ""
 
-#: classes/Command.php:333
-msgid "Notification on."
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
 msgstr ""
 
-#: classes/Command.php:335
-msgid "Can't turn on notification."
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Salir"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
 msgstr ""
 
-#: classes/Command.php:344
-msgid "Commands:\n"
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
 msgstr ""
 
-#: classes/Message.php:53
-msgid "Could not insert message."
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
 msgstr ""
 
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
+#: lib/grouptagcloudsection.php:56
+#, php-format
+msgid "Tags in %s group's notices"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Esta página no está disponible en un tipo de media que aceptes."
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Inicio de sesión"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Guardar"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Usuario o contraseña inválidos."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Crear una nueva cuenta"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:175
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
+"Hey, %s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
-msgstr ""
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s ahora está escuchando tus avisos en %2$s"
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Ubicación"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Página personal"
 
-#: lib/mail.php:253
+#: lib/mail.php:258
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
+"Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
 msgstr ""
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr ""
 
-#: lib/personal.php:65
-msgid "Favorites"
-msgstr ""
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s ahora está escuchando tus avisos en %2$s"
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+#, fuzzy
+msgid "From"
+msgstr "desde"
+
+#: lib/messageform.php:110
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Borrar estado"
+
+# ¿zumbido? creo que así lo traduce msn
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "Enviar un zumbido"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 o más caracteres"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "en respuesta a..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "No se puede eliminar este aviso."
 
-#: lib/personal.php:66
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "responder"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Borrar estado"
+
+#: lib/noticelist.php:474
+#, fuzzy
+msgid "Delete"
+msgstr "borrar"
+
+# ¿zumbido? creo que así lo traduce msn
+#: lib/nudgeform.php:116
+#, fuzzy
+msgid "Nudge this user"
+msgstr "¡Zumbido enviado!"
+
+# ¿zumbido? creo que así lo traduce msn
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Nudge"
+msgstr "¡Zumbido enviado!"
+
+# ¿zumbido? creo que así lo traduce msn
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "Enviar un zumbido"
+
+#: lib/personaltagcloudsection.php:56
 #, php-format
-msgid "%s's favorite notices"
+msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/personal.php:66
-msgid "User"
+#: lib/profilelist.php:182
+msgid "(none)"
 msgstr ""
 
-#: lib/personal.php:75
-msgid "Inbox"
-msgstr ""
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Público"
 
-#: lib/personal.php:76
-msgid "Your incoming messages"
+#: lib/publicgroupnav.php:80
+msgid "User groups"
 msgstr ""
 
-#: lib/personal.php:80
-msgid "Outbox"
-msgstr ""
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
+msgstr "Etiquetas recientes"
 
-#: lib/personal.php:81
-msgid "Your sent messages"
-msgstr ""
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr "Destacado"
 
-#: lib/settingsaction.php:99
-msgid "Twitter"
-msgstr ""
+#: lib/publicgroupnav.php:90
+msgid "Popular"
+msgstr "Popular"
 
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
-msgstr ""
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Avisos"
 
-#: lib/util.php:1718
-msgid "To"
-msgstr ""
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "Encontrar grupos en este sitio"
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
-msgstr ""
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr "Sección sin título"
+
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Personas a las que %s está suscripto"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Personas suscriptas a %s"
+
+#: lib/subgroupnav.php:97
+#, 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/subs.php:53
+msgid "User has blocked you."
+msgstr "El usuario lo ha bloqueado."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Suscribirse a este usuario"
+
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr "Ninguno"
+
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr "Principales posteadores"
+
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "No existe ese 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"
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "Crear una nueva cuenta"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "No se pudo confirmar el correo electrónico."
+
+#~ msgid "Email address"
+#~ msgstr "Dirección de correo electrónico"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Error al insertar aviso"
+
+#~ 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."
diff --git a/locale/fi/LC_MESSAGES/laconica.mo b/locale/fi/LC_MESSAGES/laconica.mo
new file mode 100644
index 000000000..315f81a7b
--- /dev/null
+++ b/locale/fi/LC_MESSAGES/laconica.mo
diff --git a/locale/fi/LC_MESSAGES/laconica.po b/locale/fi/LC_MESSAGES/laconica.po
new file mode 100644
index 000000000..626bf9210
--- /dev/null
+++ b/locale/fi/LC_MESSAGES/laconica.po
@@ -0,0 +1,4912 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-01-28 09:33+0000\n"
+"Last-Translator: Jaakko Rajaniemi <juicyburger@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"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ähetetty "
+
+# 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 %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)\n"
+"\n"
+"%2$s on mikro-bloggauspalvelu, joka auttaa sinua pysymään ajantasalla "
+"tuttujen ja kiinnostavien ihmisisten kanssa.\n"
+"\n"
+"Voit myös jakaa uutisia itsestäsi ja ajatuksiasi verkossa tuntemasi ihmisten "
+"kanssa.\n"
+"\n"
+"%1$s on sanonut:\n"
+"\n"
+"%4$s\n"
+"Voit nähdä henkilön %1$s profiilisivulta %2$s:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Jos haluat kokeilla palvelu klikkaa alla olveasta linkistä.\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 kuuntelee nyt sinun viestejä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 kuuntelee nyt sinun viestejä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äivitti statuksen joka on vastaus päivitykseen palvelussa %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 status %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 "Julkinen syöte"
+
+#: ../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 ja kaverit"
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33
+#, php-format
+msgid "%s public timeline"
+msgstr "%s julkiset päivitykset"
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#, 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"
+msgstr "%s päivitykset"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Saat pian sähköpostiisi viestin, jonka ohjeita seuraamalla voit vahvistaa "
+"sähköpostiosoitteesi.)"
+
+#: ../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%%** on mikro-bloggauspalvelu, jonka tarjoaa [%%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%%** on mikro-bloggauspalvelu. "
+
+#: ../lib/util.php:274 lib/util.php:290
+msgid ". Contributors should be attributed by full name or nickname."
+msgstr ""
+". Tunnustus kontribuoijien tulee antaa joko koko nimelle tai käyttäjä "
+"tunnukselle."
+
+#: ../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 pientä kirjainta tai numeroa, ei 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 välimerkkejä tai välilyöntejä. "
+"Pakollinen."
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
+msgid "6 or more characters"
+msgstr "6 tai useampi merkki"
+
+#: ../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 useampi merkki ja älä unohda niitä!"
+
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr "6 tai useampi merkki. Pakollinen."
+
+#: ../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 ""
+"Vahvistuskoodi lähetettiin antamaasi IM osoitteeseen. Sinun täytyy antaa "
+"oikeus lähettäjälle %s 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/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 ""
+"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/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 "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/twitapilaconica.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/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
+msgid "Accept"
+msgstr "Hyväksy"
+
+#: ../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/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/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/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:422
+msgid "All subscriptions"
+msgstr "Kaikki tilaukset"
+
+#: ../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/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
+#, 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 "Olet jo tilannut!"
+
+#: ../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 "Valtuuuta tilaus"
+
+#: ../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 joissa "
+"useampi käyttäjä!"
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Tilaa automaattisesti kaikki, jotka tilaavat minun päivitykset (ei sovi  "
+"hyvin ihmiskäyttäjille)"
+
+#: ../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 päivitetty"
+
+#: ../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 ""
+"Odotetaan vahvistusta tälle osoitteelle. Tarkista Jabber/GTalk "
+"käyttäjätilisi viestistä, jossa on lisäohjeet. (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 ""
+"Odotetaan vahvistusta tälle sähköpostiosoitteelle. Katso "
+"sähköpostilaatikostasi (ja roskapostiluukku!) viestiä jossa on lisäohjeita. "
+
+#: ../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."
+
+#: ../lib/util.php:1318 lib/util.php:1452
+msgid "Before »"
+msgstr "Ennen »"
+
+#: ../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/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 on liian pitkä (max 140 merkkiä)."
+
+#: ../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/updateprofile.php:119 actions/updateprofile.php:120
+#: actions/updateprofile.php:123
+#, php-format
+msgid "Can't read avatar URL '%s'"
+msgstr "Täsä avatar URL '%s' osoitetta ei voi avata."
+
+#: ../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 tallettaa."
+
+#: ../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"
+
+#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "Ei voi luoda OpenID käyttäjä objektia."
+
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
+msgid "Cannot normalize that Jabber ID"
+msgstr "Ei voida normalisoida Jabber ID:tä"
+
+#: ../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/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
+msgid "Change"
+msgstr "Vaihda"
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr "Vaihda sähköpostin käsittely"
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Vaihda salasana"
+
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+msgid "Change your password"
+msgstr "Vaihda salasanasi"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: lib/accountsettingsaction.php:105
+msgid "Change your profile settings"
+msgstr "Vaihda profiiliasetuksesi"
+
+#: ../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/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Vahvista Osoite"
+
+#: ../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/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr "Vahvistuskoodi"
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Vahvistuskoodia ei löytynyt."
+
+#: ../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"
+"* Mene [profiilisi](%s) ja lähetä ensimmäinen päivityksesi.\n"
+"* Lisää [Jabber/GTalk osoite ](%%%%action.imsettings%%%%) jotta saat "
+"lähetettyä päivitykset pikaviestimen kautta.\n"
+"* [Hae ihmisiä](%%%%action.peoplesearch%%%%) joita tunnet tai joilla on "
+"samanlaisia kiinnostuksen kohteita. \n"
+"* Päivitä [profiiliasi](%%%%action.profilesettings%%%%) jotta muut tietävät "
+"enemmän sinusta \n"
+"* Lue [manuaalista](%%%%doc.help%%%%) lisäohjeita. \n"
+"\n"
+"kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
+msgid "Connect"
+msgstr "Yhdistä"
+
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
+msgid "Connect existing account"
+msgstr "Yhdistä olemassa oleva käyttäjätunnus"
+
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+msgid "Contact"
+msgstr "Kontakti"
+
+# onko tuo form vai from
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#, php-format
+msgid "Could not create OpenID form: %s"
+msgstr "Ei voitu luoda OpenID lomaketta: %s"
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "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."
+
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Ei voitu tilata siirtyä palvelimelle: %s"
+
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166
+msgid "Could not save avatar info"
+msgstr "Ei voitu tallentaa avatar tietoa"
+
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159
+msgid "Could not save new profile info"
+msgstr "Ei voitu tallentaa uutta profiili tietoa"
+
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+msgid "Could not subscribe other to you."
+msgstr "Ei voitu tilata toista"
+
+#: ../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ää jolla vahvistettu sähköpostiosoite"
+
+#: ../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 tokenia access tokeniksi."
+
+#: ../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öposti vahvistusta."
+
+#: ../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/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/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/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 tallettaa profiilia."
+
+#: ../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/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/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/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
+msgid "Create"
+msgstr "Luo"
+
+#: ../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/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
+msgid "Create new account"
+msgstr "Luo uusi käyttäjätili"
+
+# Eli siis OpenID:tä kohti voi olla useampia käyttäjätili palvelussa.
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:231
+msgid "Creating new account for OpenID that already has a user."
+msgstr "Luo uusi käyttäjätili OpenID tunnukselle, jolla on jo käyttäjätili."
+
+#: ../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/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/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/showstream.php:356 actions/showstream.php:367
+msgid "Currently"
+msgstr "Tällä hetkellä"
+
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Tietokantavirhe tallennettaessa hashtagiä: %s"
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Tietokantavirhe tallennettaessa vastusta: %s"
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+#: actions/deletenotice.php:79
+msgid "Delete notice"
+msgstr "Poista päivitys"
+
+#: ../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 kiinnostuksia 140 merkillä"
+
+#: ../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/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
+msgid "Email Address"
+msgstr "Sähköpostiosoite"
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Sähköpostiasetukset"
+
+#: ../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ä."
+
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+msgid "Email address confirmation"
+msgstr "Sähköpostiosoitteen vahvistus"
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Sähköpostiosoite kuten \"käyttäjätunnus@example.org\""
+
+#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+msgid "Email addresses"
+msgstr "Sähköpostiosoitteet"
+
+#: ../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/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/userauthorization.php:137 actions/userauthorization.php:144
+#: actions/userauthorization.php:161
+msgid "Error authorizing token"
+msgstr "Virhe tapahtui tokenin hyväksynnässä."
+
+#: ../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/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/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+msgid "Error inserting avatar"
+msgstr "Virhe tapahtui avatarin lisäämisessä"
+
+#: ../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/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+msgid "Error inserting remote profile"
+msgstr "Virhe tapahtui uuden ulkoisen profiilin lisäämisessä"
+
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
+msgid "Error saving address confirmation."
+msgstr "Virhe tapahtui osoitevahvistuksen tallentamisessa"
+
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
+msgid "Error saving remote profile"
+msgstr "Virhe tapahtui ulkoisen profiilin tallentamissa"
+
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+msgid "Error saving the profile."
+msgstr "Virhe tapahtui profiilin tallentamisessa."
+
+#: ../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/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/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/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
+msgid "Error updating profile"
+msgstr "Virhe tapahtui profiilin päivittämisessä"
+
+#: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+msgid "Error updating remote profile"
+msgstr "Virhe tapahtui ulkopuolisen profiilin päivittämisessä"
+
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Virhe vahvistuskoodissa"
+
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
+msgid "Existing nickname"
+msgstr "Käyttäjätunnus on jo käytössä"
+
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+msgid "FAQ"
+msgstr "FAQ"
+
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
+msgid "Failed updating avatar."
+msgstr "Avatarin päivittäminen epäonnistui."
+
+#: ../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 "Syöte käyttäjän %s kavereista"
+
+#: ../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 vastauksista"
+
+#: ../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/login.php:122
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Turvallisuus syistä, syötä käyttäjätunnuksesi ja salasanasi uudelleen enne "
+"asetuksiesi muuttamista."
+
+#: ../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/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ä)."
+
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+msgid "Help"
+msgstr "Ohjeet"
+
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
+msgid "Home"
+msgstr "Etusivu"
+
+#: ../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/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/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:173
+msgid "I want to post notices by email."
+msgstr "Haluan lähettää päivitykseni sähköpostilla."
+
+#: ../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 Osoite"
+
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "IM Asetukset"
+
+#: ../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 ""
+"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/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 saa uuden sähköpostiisi, "
+"jonka olet tallettanut  käyttäjätunnuksellesi."
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+#: actions/emailsettings.php:127 actions/smssettings.php:140
+#, fuzzy
+msgid "Incoming email"
+msgstr "Tuleva sähköposti"
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:443
+#, fuzzy
+msgid "Incoming email address removed."
+msgstr "Sähköposti osoite poistettu."
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153
+msgid "Incorrect old password"
+msgstr "Väärä vanha salasana"
+
+#: ../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/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/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
+#, php-format
+msgid "Invalid avatar URL '%s'"
+msgstr "Avatar URL-verkkosoite '%s' ei kelpaa"
+
+#: ../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/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
+#, php-format
+msgid "Invalid homepage '%s'"
+msgstr "Kotisivun osoite '%s' ei kelpaa"
+
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
+#, php-format
+msgid "Invalid license URL '%s'"
+msgstr "Lisenssi verkko-osoite '%s' ei kelpaa"
+
+# status päivitys, päivitys, tätä ei ole vielä päätetty
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
+#, fuzzy
+msgid "Invalid notice content"
+msgstr "Status päivitys ei kelpaa"
+
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72
+#, fuzzy
+msgid "Invalid notice uri"
+msgstr "Päivityksen osoite ei kelpaa"
+
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
+msgid "Invalid notice url"
+msgstr "Päivityksen URL ei kelpaa"
+
+#: ../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/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135
+msgid "Invalid profile URL (bad format)"
+msgstr "Profiilin URL osoite '%s' ei kelpaa (huono formaatti)."
+
+#: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
+msgid "Invalid profile URL returned by server."
+msgstr "Profiilin URL-osoite ei kelpaa palvelimelle."
+
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Koko ei kelpaa."
+
+#: ../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/invite.php:79 actions/invite.php:86 actions/invite.php:102
+msgid "Invitation(s) sent"
+msgstr "Kutsu(t) lähetettiin"
+
+#: ../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:"
+
+#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
+#: lib/subgroupnav.php:103
+msgid "Invite"
+msgstr "Kutsu"
+
+#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+msgid "Invite new users"
+msgstr "Kutsu uusia käyttäjiä"
+
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#, php-format
+msgid ""
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Sivusto toimii [Laconica](http://laconi.ca/) mikroobloggauohjelmassa, "
+"versiolla %s, joka on saatavilla [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 kuuluu jo toiselle käyttäjälle."
+
+#: ../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 ja GTalk osoite kuten \"käyttäjätunnus@esimerkki.org\". Varmista että "
+"olet lisännyt %s kaverilistaasi IM ohjelmassasi tai GTalk:ssa."
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:128
+msgid "Language"
+msgstr "Kieli"
+
+# heh
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:217
+#, fuzzy
+msgid "Language is too long (max 50 chars)."
+msgstr "Kieli on liian pitkä (max 50 merkkiä)."
+
+#: ../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/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/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 "Kirjaudu sisään"
+
+#: ../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/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 ole käyttäjätunnusta "
+"vielä? [Rekisteröi](%%action.register%%) käyttäjätunnus tai kokeile [OpenID]"
+"(%%action.openidlogin%%)-tunnuksella sisään kirjautumista. "
+
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+msgid "Logout"
+msgstr "Kirjaudu ulos"
+
+#: ../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/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/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/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Hallinnoi miten saat 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ä alkaen"
+
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#, php-format
+msgid "Microblog by %s"
+msgstr "Käyttäjän %s mikro-blog"
+
+#: ../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 vastaa SMS "
+"viestilähetyksiä sähköpostilla, mutta ei ole listattu tänne, lähetä "
+"sähköpostia meille osoitteeseen %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 ""
+"Minun tekstini ja tiedostoni ovat käytettävissä seuraavan lisenssin "
+"mukaisesti  "
+
+#: ../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"
+
+#: ../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 on %s"
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:465
+msgid "New incoming email address added."
+msgstr "Uusi sähköpostiosoite lisätty."
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+#: actions/finishopenidlogin.php:99
+msgid "New nickname"
+msgstr "Uusi käyttäjätunnus"
+
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
+#, fuzzy
+msgid "New notice"
+msgstr "Uusi päivitys"
+
+#: ../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/recoverpassword.php:314
+msgid "New password successfully saved. You are now logged in."
+msgstr ""
+"Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään."
+
+#: ../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 "Käyttäjä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 "Käyttäjätunnus on jo käytössä. Yritä uutta käyttäjätunnusta."
+
+#: ../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/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
+msgid "Nickname not allowed."
+msgstr "Käyttäjätunnus ei ole sallittu."
+
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
+#: actions/remotesubscribe.php:106
+msgid "Nickname of the user you want to follow"
+msgstr "Käyttätunnus käyttäjälle jota haluat seurata"
+
+#: ../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/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
+msgid "No"
+msgstr "Ei"
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
+#: actions/imsettings.php:279
+msgid "No Jabber ID."
+msgstr "Ei Jabber ID:tä"
+
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
+msgid "No authorization request!"
+msgstr "Ei valtuutuspyyntöä!"
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+#: actions/smssettings.php:299
+msgid "No carrier selected."
+msgstr "Operaattoria ei ole valittu."
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+#: actions/smssettings.php:486
+msgid "No code entered"
+msgstr "Koodia ei ole syötetty."
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Varmistuskoodia ei ole annettu."
+
+#: ../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:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:304
+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 "Tunnusta ei ole."
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:430
+msgid "No incoming email address."
+msgstr "Sähköpostiosoitetta ei ole."
+
+#: ../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/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+msgid "No nickname."
+msgstr "Käyttäjätunnusta ei ole."
+
+#: ../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/smssettings.php:176 actions/smssettings.php:184
+#: actions/smssettings.php:294
+msgid "No phone number."
+msgstr "Puhelinnumeroa ei ole."
+
+#: ../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/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/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
+msgid "No request found!"
+msgstr "Kyselyä ei löytynyt!"
+
+#: ../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/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Kokoa ei ole."
+
+#: ../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 statustaviestiä."
+
+#: ../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 statustaviestiä."
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
+#: actions/openidsettings.php:222
+msgid "No such OpenID."
+msgstr "Tuota OpenID-tunnusta ei ole."
+
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+msgid "No such document."
+msgstr "Tuota dokumenttia ei ole."
+
+#: ../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 "Tuota päivitystä ei ole."
+
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Tuota palautuskoodia ei ole."
+
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
+#: actions/postnotice.php:60
+msgid "No such subscription"
+msgstr "Tuota 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 "Tuota käyttäjää ei ole."
+
+#: ../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."
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
+msgid "Nobody to show!"
+msgstr "Ketään ei voida näyttää."
+
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Tuo ei ole palautuskoodi."
+
+#: ../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ä."
+
+#: ../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/imsettings.php:167 actions/imsettings.php:175
+#: actions/imsettings.php:290
+msgid "Not a valid Jabber ID"
+msgstr "Tuo ei ole kelvollinen Jabber ID."
+
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+msgid "Not a valid OpenID."
+msgstr "Tuo ei ole kelvollinen OpenID."
+
+#: ../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/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/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 käyttäjätunnus."
+
+#: ../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/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/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/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/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
+msgid "Not authorized."
+msgstr "Ei valtuutusta."
+
+#: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#, fuzzy
+msgid "Not expecting this response!"
+msgstr "Odottamaton vastaus!"
+
+#: ../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 sisään kirjautunut."
+
+#: ../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
+#, fuzzy
+msgid "Notice Search"
+msgstr "Päivitys Haku"
+
+#: ../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
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy, php-format
+msgid "Notices tagged with %s"
+msgstr "Päivitykset joilla on tägi %s"
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
+msgid "Old password"
+msgstr "Vanha salasana"
+
+#: ../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 ""
+
+#: ../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 Verkko-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 peruutettiin."
+
+#: ../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/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
+msgid "Partial upload."
+msgstr "Osittain ladattu palvelimelle."
+
+#: ../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/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/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 useampi merkkiä."
+
+#: ../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 takaisinsaantipyyntö lähetetty."
+
+#: ../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/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ää."
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Ihmiset"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Etsi Ihmisiä"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Etsi ihmisiä"
+
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+msgid "Personal"
+msgstr "Henkilökohtainen"
+
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr "Henkilökohtainen viesti"
+
+#: ../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ä"
+
+#: ../actions/userauthorization.php:78
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user's notices. If you didn't just ask to subscribe to someone's notices, "
+"click \"Cancel\"."
+msgstr ""
+
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
+#: actions/imsettings.php:142
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Lähetä päivitys kun minun Jabber/GTalk tilatieto vaihtuu."
+
+#: ../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/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/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:129
+msgid "Preferred language"
+msgstr "Ensisijainen kieli"
+
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+msgid "Privacy"
+msgstr "Yksityisyys"
+
+#: ../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."
+
+#: ../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/remotesubscribe.php:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
+msgid "Profile URL"
+msgstr "Profiili URL"
+
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
+msgid "Profile settings"
+msgstr "Profiili asetukset"
+
+#: ../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/public.php:54 actions/public.php:54 actions/public.php:124
+msgid "Public Stream Feed"
+msgstr ""
+
+# 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/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Julkaise minun Jabber/GTalk osoite MicroID:nä."
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+msgid "Publish a MicroID for my email address."
+msgstr "Julkaise minun sähköpostiosoite MicroID:nä."
+
+# Tagi, tägi,...
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr "Viimeaikaiset Tagit"
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
+msgid "Recover"
+msgstr "Palautus"
+
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198
+msgid "Recover password"
+msgstr "Salasanan palautus"
+
+#: ../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/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/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/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr "Rekisteröityminen onnistui"
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
+msgid "Reject"
+msgstr "Hylkää"
+
+#: ../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/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
+msgid "Remote profile with no matching profile"
+msgstr ""
+
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
+msgid "Remote subscribe"
+msgstr ""
+
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 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/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
+msgid "Remove OpenID"
+msgstr "Poista OpenID"
+
+#: ../actions/openidsettings.php:73
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"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
+#, php-format
+#, fuzzy
+msgid "Replies to %s"
+msgstr "Vastaukset päivitykseen %s"
+
+# Palauta, aseta uudelleen, uudelleenasetus, nollaus, tyhjää
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
+#, fuzzy
+msgid "Reset"
+msgstr "Palauta"
+
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
+msgid "Reset password"
+msgstr "Vaihda salasana"
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr "SMS puhelinnumero"
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS Asetukset"
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr "SMS vahvistus"
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
+msgid "Same as password above"
+msgstr "Sama kuin ylläoleva salasana"
+
+#: ../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/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"
+
+#: ../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/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
+msgid "Search Stream Feed"
+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 ""
+"Hae päivityksiä palvelun %%site.name%% sisällöistä. Erota hakutermit "
+"välilyönnillä; hakutermien pitää olla 3 tai useamman merkin pituinen."
+
+#: ../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 ""
+"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 pituinen."
+
+#: ../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 "Teet uuden päivityksen lähettämällä sähköpostin tähän osoitteeseen."
+
+#: ../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."
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
+#: actions/imsettings.php:137
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Lähetä päivitykset Jabber/GTalk:lla."
+
+#: ../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äivitykset SMS:llä; tämä voi aiheuttaa kustannuksia sinulle."
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr "Lähetä vastaukset Jabber/GTalk:lla ihmisiltä, 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 sähköpostipäivityksiä eivät ole sallittuja."
+
+#: ../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 "Lähde"
+
+#: ../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 systeemivirhe."
+
+#: ../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/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/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/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:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
+msgid "That is already your Jabber ID."
+msgstr "Tämä on jo sinun Jabber ID."
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr "Tämä on jo sinun sähköpostiosoitteesi."
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+msgstr "Tämä on jo sinun puhelinnumerosi."
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
+msgid "That is not your Jabber ID."
+msgstr "Tämä ei ole sinun Jabber ID."
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:397
+msgid "That is not your email address."
+msgstr "Tämä ei ole sinun 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 sinun 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ä IM osoite."
+
+#: ../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äivityksen koko on liian pitkä. Maksimi pituus 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äivityksen koko on liian pitkä. Maksimi pituus on 255 merkkiä."
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Osoite \"%s\" on vahvistettu sinun käyttäjätunnuksellesi."
+
+#: ../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."
+
+# En nyt ihan tarkkaan tiedä milloin tämä virhe tulee. Pitää vielä tarkistaa.
+#: ../actions/userauthorization.php:312
+#, 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 vaadittavaa verkko-osoitetta "
+"palveluun ei ole saatu. Tarkista sivun ohjeet miten päivityksen tilaus "
+"hyväksytään. Sinun tilauskoodi on:"
+
+# En nyt ihan tarkkaan tiedä milloin tämä virhe tulee. Pitää vielä tarkistaa.
+#: ../actions/userauthorization.php:322
+#, 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 vaadittavaa verkko-osoitetta palveluun "
+"ei ole saatu. Tarkista sivun ohjeista miten päivityksen tilaus hylätään "
+"kokonaan."
+
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#, 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ä."
+
+#: ../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ä."
+
+#: ../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/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:89 actions/invite.php:96 actions/invite.php:128
+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äivitykset:"
+
+#: ../actions/recoverpassword.php:88
+msgid "This confirmation code is too old. Please start again."
+msgstr "Vahvistuskoodi on liian vanha. Aloita uudelleen."
+
+#: ../lib/openid.php:195
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Lomake pitäisi lähettää automaattisesti tiedot. Jos kuitenkin 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 käyttäjän %s, joten "
+"sinun OpenID-tunnus pitää yhdistää johonkin tämän palvelun "
+"käyttäjätunnukseen. Tätä varten voit luoda uuden käyttäjätunnuksen tai "
+"yhdistää 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ää joko 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 media tyypissä."
+
+#: ../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öhyke ei ole valittu."
+
+#: ../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 ""
+"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  jollain [yhteensopivalla mikro-"
+"bloggauspalvelussa](%%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."
+
+#: ../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-osoite kotivulle, blogiin tai toisen sivuston profiilin"
+
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
+#: actions/remotesubscribe.php:110
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL-osoite toiseen yhteensopivaan mikro-bloggauspalvelun profiilin"
+
+#: ../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/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323
+msgid "Unexpected password reset."
+msgstr "Odottamaton salasanan uudelleenasetus."
+
+#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+msgid "Unknown action"
+msgstr "Tuntematon toiminta"
+
+#: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
+msgid "Unknown version of OMB protocol."
+msgstr "Tuntematon OMB protokollan versio."
+
+#: ../lib/util.php:269 lib/util.php:285
+#, fuzzy
+msgid ""
+"Unless otherwise specified, contents of this site are copyright by the "
+"contributors and available under the "
+msgstr ""
+"Jos muuten ei ole määritelty, tämän palvelun sisältöjen tekijänoikeudet "
+"kuuluvat niiden kirjoittajille ja ovat saatavilla seuraavan lisenssin "
+"mukaisesti "
+
+# formaatti/tyyppi
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Tuntematon osoiteformaatti %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."
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr "Päivitykset SMS:llä"
+
+#: ../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/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:129
+#, 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/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 \"avatar\" (kuva käyttäjästa) tästä. Voit editoida kuvaa lataamisen "
+"jälkeen. Kuvan pitää olla palvelun tekijänoikeuslisenssin mukainen. 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."
+
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
+msgid "User nickname"
+msgstr "Käyttäjätunnus"
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr "Käyttäjää ei löytynyt."
+
+#: ../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?"
+
+# Suora FB kopio.
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#, 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 "Asuinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
+
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
+#, php-format
+msgid "Wrong image type for '%s'"
+msgstr "Väärä kuvatyyppi käyttäjälle '%s'"
+
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
+#, php-format
+msgid "Wrong size image at '%s'"
+msgstr "Väärä kuvakoko käyttäjälle '%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 "Kyllä"
+
+#: ../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/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/recoverpassword.php:31 actions/recoverpassword.php:31
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Olet jo kirjautunut 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/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr "Ette ole kavereita tämän henkilön kanssa."
+
+#: ../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/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/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 ""
+"Voit saada SMS viestit sähköpostin välityksellä %%site.name%% palvelussa."
+
+#: ../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/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 ""
+"Voit lähettää ja vastaanottaa päivityksiä Jabber/GTalk "
+"[pikaviestintä](%%doc.im%%) käyttäen. Alla voit määrittää sinun osoitteen ja "
+"asetukset. "
+
+#: ../actions/profilesettings.php:27
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Voit päivittää täällä sinun henkilötietojasi, jotta muut voivat tietää "
+"enemmän sinusta."
+
+#: ../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."
+
+#: ../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"
+
+#: ../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 ""
+"Sinulla on uusi päivityksien lähetysosoite palvelussa %1$s.\n"
+"\n"
+"Lähetä sähköposti osoitteeseen %2$s tehdessäsi uusi päivitys.\n"
+"\n"
+"Lisää sähköpostiksen ohjeista voit lukea täältä %3$s.\n"
+"\n"
+"Terveisin,\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 "Et voi poistaa toisen käyttäjän päivitystä."
+
+#: ../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 ""
+"Sinun pitää olla kirjautunut sisään, jos haluat kutsua uusia käyttäjiä "
+"palveluun %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 ""
+
+#: ../actions/recoverpassword.php:164
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+
+#: ../actions/openidsettings.php:28
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
+"account.  Manage your associated OpenIDs from here."
+msgstr ""
+
+#: ../lib/util.php:943 lib/util.php:992 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 ""
+
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#, php-format
+msgid "about %d hours ago"
+msgstr ""
+
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#, php-format
+msgid "about %d minutes ago"
+msgstr ""
+
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#, php-format
+msgid "about %d months ago"
+msgstr ""
+
+#: ../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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
+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/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 ""
+
+#: 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
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53 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 ""
+
+#: 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 ""
+
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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
+#, php-format
+msgid "Feed for favorites of %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 ""
+
+#: 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/showmessage.php:61 actions/showmessage.php:108
+#, 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"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, 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"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#, 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"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, 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."
+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/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#, php-format
+msgid "%s updates favorited by %s / %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 ""
+
+#: 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 ""
+
+#: 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/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 ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: 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 ""
+
+#: 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/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 ""
+
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96 classes/Command.php:113
+#, 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."
+msgstr ""
+
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175 classes/Command.php:198
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270 classes/Command.php:307
+#, 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"
+msgstr ""
+
+#: classes/Command.php:295 classes/Command.php:335
+#, 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."
+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 ""
+
+#: 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 ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253 lib/mail.php:512
+#, 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."
+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
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: 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 ""
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s ja kaverit"
+
+#: actions/avatarsettings.php:76
+msgid "You can upload your personal avatar."
+msgstr ""
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Sähköpostiasetukset"
+
+#: 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 ""
+
+#: 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
+#, php-format
+msgid "The address \"%s\" has been "
+msgstr ""
+
+#: actions/deletenotice.php:73
+#, fuzzy
+msgid "You are about to permanently delete a notice. "
+msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
+#, 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"
+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
+#, fuzzy
+msgid "No nickname"
+msgstr "Käyttäjätunnusta ei ole."
+
+#: 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 "Tuota käyttäjää ei ole."
+
+#: 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 ""
+
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
+msgstr ""
+"Käyttäjätunnuksessa voi olla ainoastaan pieniä kirjaimia ja numeroita ilman "
+"välilyöntiä."
+
+#: actions/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "Bio on liian pitkä (max 140 merkkiä)."
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Ei voitu päivittää käyttäjää."
+
+#: actions/editgroup.php:226
+msgid "Options saved."
+msgstr ""
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#, fuzzy
+msgid "Make a new email address for posting to; "
+msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen on %s"
+
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
+msgstr ""
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/emailsettings.php:321
+#, fuzzy
+msgid "That email address already belongs "
+msgstr "Sähköpostiosoite on jo käytössä."
+
+#: actions/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
+msgstr ""
+"Vahvistuskoodi lähetettiin antamaasi IM osoitteeseen. Sinun täytyy antaa "
+"oikeus lähettäjälle %s lähettää viestejä sinulle."
+
+#: 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 ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, 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 "Ei sisältöä!"
+
+#: 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
+#, fuzzy
+msgid "Before"
+msgstr "Ennen »"
+
+#: actions/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:72
+#, fuzzy
+msgid "Invitations have been sent to the following users:"
+msgstr "Kutsu(t) lähetettiin seuraaville henkilöille:"
+
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
+msgstr ""
+
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "Syöte käyttäjän %s kavereista"
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, 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."
+msgstr ""
+
+#: actions/facebooksettings.php:106
+msgid "Prefix"
+msgstr ""
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, 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
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.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
+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/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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Avatar päivitetty"
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Avatarin päivittäminen epäonnistui."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+msgstr ""
+
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#, fuzzy
+msgid "Create a new group"
+msgstr "Luo uusi käyttäjätili"
+
+#: actions/groupsearch.php:57
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+msgstr ""
+
+#: actions/groupsearch.php:63
+msgid "Group search"
+msgstr ""
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
+msgstr ""
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+msgid "Send me replies through Jabber/GTalk "
+msgstr ""
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Varmistuskoodia ei ole annettu."
+
+#: 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 ""
+
+#: actions/joingroup.php:128
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Ei voitu tilata käyttäjää: Käyttäjää ei löytynyt."
+
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "No such group."
+msgstr "Tuota käyttäjää ei ole."
+
+#: 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
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "Ei voitu päivittää käyttäjätietoja."
+
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Ei voitu tilata käyttäjää: Käyttäjää ei löytynyt."
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "Could not create group."
+msgstr "Ei voitu tilata toista"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Ei voitu tilata"
+
+#: 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 ""
+
+#: 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/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "OpenID Sisäänkirjautuminen"
+
+#: actions/openidsettings.php:128
+msgid "Removing your only OpenID "
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Vaihda salasanasi"
+
+#: actions/passwordsettings.php:89
+msgid "Password change"
+msgstr ""
+
+#: actions/peopletag.php:35
+#, 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 ""
+
+#: actions/peopletag.php:91
+#, 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"
+msgstr ""
+
+#: actions/profilesettings.php:144
+#, fuzzy
+msgid "Automatically subscribe to whoever "
+msgstr ""
+"Tilaa automaattisesti kaikki, jotka tilaavat minun päivitykset (ei sovi  "
+"hyvin ihmiskäyttäjille)"
+
+#: actions/profilesettings.php:229 actions/tagother.php:176
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr ""
+
+#: actions/profilesettings.php:311
+msgid "Couldn't save tags."
+msgstr ""
+
+#: actions/public.php:107
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "%s julkiset päivitykset"
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/public.php:220
+#, 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"
+msgstr ""
+
+#: actions/publictagcloud.php:63
+#, 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
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, "
+msgstr "1-64 pientä kirjainta tai numeroa, ei välimerkkejä tai välilyöntejä"
+
+#: 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
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Kuvaile itseäsi ja kiinnostuksia 140 merkillä"
+
+#: actions/register.php:410
+msgid "Where you are, like \"City, "
+msgstr ""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+msgstr ""
+" poislukien yksityinen tieto: salasana, sähköpostiosoite, IM osoite, "
+"puhelinnumero."
+
+#: actions/register.php:471
+#, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr ""
+
+#: 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 ""
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
+msgstr ""
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
+
+#: actions/showgroup.php:206
+#, fuzzy
+msgid "Group profile"
+msgstr "Virhe tapahtui profiilin päivittämisessä"
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
+msgstr ""
+
+# Notice suomennos vielä hakusessa
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#, fuzzy
+msgid "Note"
+msgstr "Päivitykset"
+
+#: actions/showgroup.php:270
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
+msgid "Members"
+msgstr "Käyttäjä alkaen"
+
+#: 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/showgroup.php:370
+msgid "All members"
+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 "
+msgstr ""
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
+msgstr ""
+
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
+msgstr ""
+
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Ei voitu tallettaa profiilia."
+
+#: actions/showstream.php:236 actions/tagother.php:77
+msgid "User profile"
+msgstr ""
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Kaikki tilaukset"
+
+#: actions/showstream.php:533
+msgid "All groups"
+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 "
+msgstr ""
+
+#: actions/smssettings.php:128
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, "
+msgstr "1-64 pientä kirjainta tai numeroa, ei välimerkkejä tai välilyöntejä"
+
+#: actions/smssettings.php:162
+msgid "Send me notices through SMS; "
+msgstr ""
+
+#: actions/smssettings.php:335
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. "
+msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
+
+#: actions/smssettings.php:453
+msgid "Mobile carrier"
+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
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Ei ole tilattu!."
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr ""
+
+#: actions/subscribers.php:63
+msgid "These are the people who listen to "
+msgstr ""
+
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who "
+msgstr ""
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Kaikki tilaukset"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Kaikki tilaukset"
+
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices "
+msgstr ""
+
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose "
+msgstr ""
+
+#: actions/subscriptions.php:122
+msgid "Jabber"
+msgstr ""
+
+# tagi, tägätty, tagätty, tagatty, tagitetty,
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Päivitykset joilla on tägi %s"
+
+#: actions/tag.php:66
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+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: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."
+msgstr ""
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:198
+msgid "Could not save tags."
+msgstr ""
+
+#: actions/tagother.php:233
+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
+#, php-format
+msgid "Microblog tagged with %s"
+msgstr ""
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+msgid "Not found."
+msgstr ""
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:126
+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
+#, 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 ""
+
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:71
+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 ""
+
+#: classes/Notice.php:104
+msgid "Problem saving notice. Unknown user."
+msgstr ""
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Avatarin päivittäminen epäonnistui."
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr ""
+
+#: lib/action.php:130
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "Tietoa"
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "Vaihda salasanasi"
+
+#: 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"
+msgstr ""
+
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Luo uusi käyttäjätili"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "Tuota OpenID-tunnusta ei ole."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Ohjeet"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "Uusi päivitys"
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "Uusi päivitys"
+
+#: lib/action.php:562
+msgid "Secondary site navigation"
+msgstr ""
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+msgid "All "
+msgstr ""
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+msgid "Block this user"
+msgstr ""
+
+#: lib/blockform.php:153
+msgid "Block"
+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 "Luo uusi käyttäjätili"
+
+#: 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 "Tuota päivitystä ei ole."
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr ""
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
+
+#: lib/galleryaction.php:137
+msgid "Tag"
+msgstr ""
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+msgid "URL of the homepage or blog of the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Kaikki tilaukset"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Kuvaile itseäsi ja kiinnostuksia 140 merkillä"
+
+#: lib/groupeditform.php:158
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Kirjaudu ulos"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+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
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Kotisivun verkko-osoite ei ole toimiva."
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Kirjaudu sisään"
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr ""
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Käyttäjätunnus tai salasana ei kelpaa."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+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 ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s kuuntelee nyt sinun viestejäsi palvelussa %2$s."
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Kotipaikka"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Kotisivu"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
+
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s kuuntelee nyt sinun viestejäsi palvelussa %2$s."
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+#, fuzzy
+msgid "From"
+msgstr " lähetetty "
+
+#: lib/messageform.php:110
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Poista päivitys"
+
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "Uusi päivitys"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 tai useampi merkki"
+
+#: lib/noticelist.php:426
+msgid "in reply to"
+msgstr ""
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Tätä päivitystä ei voi poistaa."
+
+#: lib/noticelist.php:451
+msgid "Reply"
+msgstr ""
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Poista päivitys"
+
+#: lib/noticelist.php:474
+#, fuzzy
+msgid "Delete"
+msgstr "Poista päivitys"
+
+#: 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/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr ""
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr ""
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
+msgstr ""
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90
+msgid "Popular"
+msgstr ""
+
+# Notice suomennos vielä hakusessa
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Päivitykset"
+
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "Hae ihmisiä tältä sivustolta"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Ei voitu tilata"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Ei ole tilattu!."
+
+#: lib/subgroupnav.php:97
+#, 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 ""
+
+#: lib/subs.php:53
+msgid "User has blocked you."
+msgstr ""
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr ""
+
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+msgstr "Ei"
+
+#: lib/topposterssection.php:74
+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 ""
diff --git a/locale/fr_FR/LC_MESSAGES/laconica.mo b/locale/fr_FR/LC_MESSAGES/laconica.mo
index 3f144d677..612d3ade1 100644
--- a/locale/fr_FR/LC_MESSAGES/laconica.mo
+++ b/locale/fr_FR/LC_MESSAGES/laconica.mo
diff --git a/locale/fr_FR/LC_MESSAGES/laconica.po b/locale/fr_FR/LC_MESSAGES/laconica.po
index eba0e8a3c..6a90a53cb 100644
--- a/locale/fr_FR/LC_MESSAGES/laconica.po
+++ b/locale/fr_FR/LC_MESSAGES/laconica.po
@@ -14,1469 +14,50 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Project-Id-Version: 0.43\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-17 11:01-0400\n"
-"PO-Revision-Date: 2008-07-13 22:49+0200\n"
-"Last-Translator: Florian Birée <florian@biree.name>\n"
-"Language-Team: French\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-01-26 23:40+0000\n"
+"Last-Translator: Pierre-Luc Daoust <courriel@pierrelucdaoust.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 1.1.0\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " Flux de recherche pour « %s »"
 
-#: ../actions/shownotice.php:45
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "Statut de %1$s sur %2$s"
-
-#: ../actions/publicrss.php:60
-#, php-format
-msgid "%s Public Stream"
-msgstr "Flux public de %s"
-
-#: ../actions/openidsettings.php:43
-msgid "Add OpenID"
-msgstr "Ajouter un OpenID"
-
-#: ../actions/publicrss.php:62
-#, php-format
-msgid "All updates for %s"
-msgstr "Toutes les mises à jour pour %s"
-
-#: ../actions/noticesearchrss.php:66
-#, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Toutes les mises à jour correspondantes aux termes cherchés « %s »"
-
-#: ../actions/avatar.php:113
-msgid "Avatar updated."
-msgstr "Avatar mis à jour."
-
-#: ../actions/imsettings.php:55
-#, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
-msgstr ""
-"En attente d'une confirmation pour cette adresse. Vérifiez votre "
-"compteJabber/GTalk pour recevoir un message avec les instructions "
-"suivantes.(Avez-vous ajouté %s à votre liste de contacts ?)"
-
-#: ../lib/openid.php:121
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Impossible d'instancier l'objet client pour OpenID"
-
-#: ../actions/password.php:45
-msgid "Change"
-msgstr "Changer"
-
-#: ../actions/password.php:32
-msgid "Change password"
-msgstr "Changer de mot de passe"
-
-#: ../actions/confirmaddress.php:38
-msgid "Confirmation code not found."
-msgstr "Code de confirmation non trouvé."
-
-#: ../actions/finishopenidlogin.php:91
-msgid "Connect"
-msgstr "Connecter"
-
-#: ../actions/finishopenidlogin.php:86
-msgid "Connect existing account"
-msgstr "Connecté à un compte existant"
-
-#: ../lib/openid.php:178
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Impossible de créer le formulaire OpenID : %s"
-
-#: ../lib/openid.php:160
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Impossible de rediriger vers le serveur : %s"
-
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Impossible de confirmer l'email"
-
-#: ../actions/finishremotesubscribe.php:99
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Impossible de convertir les jetons de requête en jetons d'accès"
-
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Impossible de créer l'inscription."
-
-#: ../actions/remotesubscribe.php:125
-msgid "Couldn't get a request token."
-msgstr "Impossible d'obtenir le jeton de requête."
-
-#: ../actions/finishremotesubscribe.php:180
-msgid "Couldn't insert new subscription."
-msgstr "Impossible d'insérer une nouvelle inscription."
-
-#: ../actions/finishopenidlogin.php:84
-msgid "Create"
-msgstr "Créer"
-
-#: ../actions/finishopenidlogin.php:70
-msgid "Create a new user with this nickname."
-msgstr "Créer un nouvel utilisateur avec ce surnom."
-
-#: ../actions/finishopenidlogin.php:68
-msgid "Create new account"
-msgstr "Créer un nouveau compte"
-
-#: ../actions/finishopenidlogin.php:191
-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/imsettings.php:45
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Adresse Jabber/GTalk actuellement confirmée."
-
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Adresse email"
-
-#: ../actions/finishaddopenid.php:78
-msgid "Error connecting user."
-msgstr "Erreur de connexion d'utilisateur."
-
-#: ../actions/finishremotesubscribe.php:151
-msgid "Error inserting avatar"
-msgstr "Erreur lors de l'insertion d'un avatar"
-
-#: ../actions/finishremotesubscribe.php:143
-msgid "Error inserting new profile"
-msgstr "Erreur lors de l'insertion d'un nouveau profil"
-
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Erreur lors de l'insertion d'un message"
-
-#: ../actions/finishremotesubscribe.php:167
-msgid "Error inserting remote profile"
-msgstr "Erreur lors de l'insertion d'un profil distant"
-
-#: ../lib/openid.php:237
-msgid "Error saving the user."
-msgstr "Erreur lors de l'enregistrement de l'utilisateur."
-
-#: ../actions/password.php:80
-msgid "Error saving user; invalid."
-msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide."
-
-#: ../actions/finishaddopenid.php:83
-msgid "Error updating profile"
-msgstr "Erreur lors de la mise à jour du profil"
-
-#: ../actions/finishremotesubscribe.php:161
-msgid "Error updating remote profile"
-msgstr "Erreur lors de la mise à jour du profil distant"
-
-#: ../actions/finishopenidlogin.php:89
-msgid "Existing nickname"
-msgstr "Surnom existant"
-
-#: ../actions/avatar.php:115
-msgid "Failed updating avatar."
-msgstr "La mise à jour de l'avatar a échoué."
-
-#: ../actions/imsettings.php:33
-msgid "IM Settings"
-msgstr "Paramètres de messagerie instantanée"
-
-#: ../actions/finishopenidlogin.php:88
-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, connectez-vous avec votre nom d'utilisateur "
-"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 ""
-"Si vous voulez ajouter un OpenID à votre compte, entrez-le dans le champ "
-"ci-dessous et cliquez sur « Ajouter »."
-
-#: ../actions/password.php:69
-msgid "Incorrect old password"
-msgstr "Ancien mot de passe incorrect"
-
-#: ../actions/postnotice.php:61
-msgid "Invalid notice content"
-msgstr "Contenu du message invalide"
-
-#: ../actions/postnotice.php:67
-msgid "Invalid notice uri"
-msgstr "URI du message invalide"
-
-#: ../actions/postnotice.php:72
-msgid "Invalid notice url"
-msgstr "URL du message invalide"
-
-#: ../actions/remotesubscribe.php:96
-msgid "Invalid profile URL (bad format)"
-msgstr "URL du profil invalide (mauvais format)"
-
-#: ../actions/finishremotesubscribe.php:77
-msgid "Invalid profile URL returned by server."
-msgstr "URL du profil retourné par le serveur invalide."
-
-#: ../actions/avatarbynickname.php:37
-msgid "Invalid size."
-msgstr "Taille invalide."
-
-#: ../lib/util.php:237
-#, php-format
-msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public License] "
-"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-"Il utilise le logiciel de microblog [Laconica](http://laconi.ca/), version "
-"%s, disponible sous la licence [GNU Affero General Public License] "
-"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-
-#: ../actions/openidlogin.php:44
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Se connecter avec un compte [OpenID](%%doc.openid%%)."
-
-#: ../actions/userrss.php:70
-#, php-format
-msgid "Microblog by %s"
-msgstr "Microblog par %s"
-
-#: ../actions/finishopenidlogin.php:71
-msgid "New nickname"
-msgstr "Nouveau surnom"
-
-#: ../actions/finishopenidlogin.php:170
-msgid "Nickname not allowed."
-msgstr "Surnom non-autorisé."
-
-#: ../actions/remotesubscribe.php:72
-msgid "Nickname of the user you want to follow"
-msgstr "Surnom de l'utilisateur à surveiller"
-
-#: ../actions/confirmaddress.php:33
-msgid "No confirmation code."
-msgstr "Pas de code de confirmation."
-
-#: ../actions/finishremotesubscribe.php:65
-msgid "No nickname provided by remote server."
-msgstr "Pas de surnom proposé par le serveur distant."
-
-#: ../actions/avatarbynickname.php:27
-msgid "No nickname."
-msgstr "Pas de surnom."
-
-#: ../actions/finishremotesubscribe.php:72
-msgid "No profile URL returned by server."
-msgstr "Pas d'URL de profil retourné par le serveur."
-
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-msgid "No results"
-msgstr "Pas de résultats"
-
-#: ../actions/avatarbynickname.php:32
-msgid "No size."
-msgstr "Pas de taille."
-
-#: ../actions/openidsettings.php:135
-msgid "No such OpenID."
-msgstr "Il n'y a pas cet OpenID."
-
-#: ../actions/doc.php:29
-msgid "No such document."
-msgstr "Il n'y a pas ce document.'"
-
-#: ../actions/recoverpassword.php:56
-msgid "No such recovery code."
-msgstr "Il n'y a pas ce code de récupération."
-
-#: ../actions/postnotice.php:56
-msgid "No such subscription"
-msgstr "Il n'y a pas cette inscription'"
-
-#: ../actions/recoverpassword.php:60
-msgid "Not a recovery code."
-msgstr "Pas de code de récupération."
-
-#: ../lib/openid.php:131
-msgid "Not a valid OpenID."
-msgstr "Ce n'est pas un OpenID valide."
-
-#: ../actions/remotesubscribe.php:118
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Ce n'est pas un URL de profil valide (services incorrects)."
-
-#: ../actions/remotesubscribe.php:111
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Ce n'est pas un URL de profil valide (pas de XRDS défini)."
-
-#: ../actions/remotesubscribe.php:104
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Ce n'est pas un URL de profil valide (pas de document YADIS)."
-
-#: ../actions/avatar.php:95
-msgid "Not an image or corrupt file."
-msgstr "Ce n'est pas une image, ou c'est un fichier corrompu."
-
-#: ../actions/finishremotesubscribe.php:51
-msgid "Not authorized."
-msgstr "Non autorisé."
-
-#: ../actions/finishremotesubscribe.php:38
-msgid "Not expecting this response!"
-msgstr "Cette réponse n'était pas attendue !"
-
-#: ../actions/showstream.php:82
-#, php-format
-msgid "Notice feed for %s"
-msgstr "Fil des messages de %s"
-
-#: ../actions/shownotice.php:39
-msgid "Notice has no profile"
-msgstr "Le message n'a pas de profil"
-
-#: ../actions/password.php:39
-msgid "Old password"
-msgstr "Ancien mot de passe"
-
-#: ../actions/finishopenidlogin.php:61
-msgid "OpenID Account Setup"
-msgstr "Mise en place du compte OpenID"
-
-#: ../lib/openid.php:180
-msgid "OpenID Auto-Submit"
-msgstr "Soumission automatique OpenID"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
-msgid "OpenID Login"
-msgstr "Connexion OpenID"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-msgid "OpenID URL"
-msgstr "URL OpenID"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-msgid "OpenID authentication cancelled."
-msgstr "Authentification OpenID annulée."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "L'authentification OpenID a échouée : %s'"
-
-#: ../lib/openid.php:133
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Erreur OpenID : %s"
-
-#: ../actions/openidsettings.php:144
-msgid "OpenID removed."
-msgstr "OpenID enlevé."
-
-#: ../actions/openidsettings.php:37
-msgid "OpenID settings"
-msgstr "Paramètres OpenID"
-
-#: ../actions/avatar.php:84
-msgid "Partial upload."
-msgstr "Transfert partiel."
-
-#: ../actions/peoplesearch.php:33
-msgid "People search"
-msgstr "Rechercher des personnes"
-
-#: ../actions/remotesubscribe.php:73
-msgid "Profile URL"
-msgstr "URL du profil"
-
-#: ../actions/profilesettings.php:34
-msgid "Profile settings"
-msgstr "Paramètres du profil"
-
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Public"
-
-#: ../actions/public.php:54
-msgid "Public Stream Feed"
-msgstr "Fil du flux public"
-
-#: ../actions/public.php:33
-msgid "Public timeline"
-msgstr "Évolution publique"
-
-#: ../actions/recoverpassword.php:67
-msgid "Recovery code for unknown user."
-msgstr "Code de récupération d'un utilisateur inconnu."
-
-#: ../actions/remotesubscribe.php:65
-msgid "Remote subscribe"
-msgstr "Inscription distante"
-
-#: ../actions/openidsettings.php:68
-msgid "Remove OpenID"
-msgstr "Enlever l'OpenID"
-
-#: ../actions/openidsettings.php:73
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-"Enlever votre seul OpenID vous empêcherai de vous connecter ! Si vous avez "
-"besoin de l'enlever, ajoutez un autre OpenID d'abord."
-
-#: ../actions/noticesearch.php:80
-msgid "Search Stream Feed"
-msgstr "Fil du flux de recherche"
-
-#: ../actions/noticesearch.php:30
-#, php-format
-msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
-msgstr ""
-"Recherche des messages sur %%site.name%% par leur contenu. Séparez les "
-"termes de la recherches par des espaces ; ils doivent être de 3 caractères "
-"ou plus."
-
-#: ../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 ""
-"Recherche de personne sur %%site.name%% par leur nom, localisation ou "
-"intérêt. Séparez les termes de la recherches par des espaces ; ils "
-"doivent être de 3 caractères ou plus."
-
-#: ../actions/finishaddopenid.php:66
-msgid "Someone else already has this OpenID."
-msgstr "Quelqu'un d'autre a déjà cet OpenID."
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-msgid "Something weird happened."
-msgstr "Quelque chose de bizarre est arrivé."
-
-#: ../actions/avatar.php:87
-msgid "System error uploading file."
-msgstr "Erreur système en transférant le fichier."
-
-#: ../actions/noticesearch.php:34
-msgid "Text search"
-msgstr "Texte cherché"
-
-#: ../actions/openidsettings.php:140
-msgid "That OpenID does not belong to you."
-msgstr "Cet OpenID ne vous appartient pas."
-
-#: ../actions/confirmaddress.php:52
-msgid "That address has already been confirmed."
-msgstr "Cette adresse a déjà été confirmée."
-
-#: ../actions/confirmaddress.php:43
-msgid "That confirmation code is not for you!"
-msgstr "Ce code de confirmation n'est pas pour vous !"
-
-#: ../actions/avatar.php:80
-msgid "That file is too big."
-msgstr "Ce fichier est trop gros."
-
-#: ../actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Ce sont les personnes qui suivent les messages de %s."
-
-#: ../actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Ce sont les personnes qui suivent vos messages."
-
-#: ../actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Ce sont les personnes dont les messages sont suivis par %s."
-
-#: ../actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Ce sont les personnes dont vous suivez les messages."
-
-#: ../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 aller chez votre fournisseur "
-"OpenID."
-
-#: ../actions/finishopenidlogin.php:56
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your OpenID "
-"to a local account. You can either create a new account, or connect with "
-"your existing account, if you have one."
-msgstr ""
-"Ce la première fois que vous vous êtes connectés à %s, donc nous devons "
-"connecter votre OpenID à un compte local. Vous pouvez soit créer un "
-"nouveau compte, soit vous connectez avec un compte existant, si vous en avez "
-
-#: ../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 ""
-"Pour s'inscrire, vous pouvez [vous connecter](%%action.login%%), ou [créer "
-"unnouveau compte](%%action.register%%). Si vous avez déjà un compte sur un "
-"[site de microblog compatible](%%doc.openmublog%%), entrez l'URL de votre "
-"profil ci-dessous."
-
-#: ../actions/remotesubscribe.php:74
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL de votre profil sur un autre service de microblog compatible"
-
-#: ../actions/finishremotesubscribe.php:58
-msgid "Unknown version of OMB protocol."
-msgstr "Version inconnue du protocole OMB"
-
-#: ../actions/confirmaddress.php:48
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Type d'adresse non reconnu : %s"
-
-#: ../actions/avatar.php:105
-msgid "Unsupported image file format."
-msgstr "Format de fichier d'image non-supporté."
-
-#: ../actions/avatar.php:68
-msgid "Upload"
-msgstr "Transfert."
-
-#: ../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 ""
-"Transférez ici un nouvel « avatar » (image 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 soumise à la licence du site. Utilisez "
-"une image qui vous appartient et que vous voulez partager."
-
-#: ../actions/finishremotesubscribe.php:86
-msgid "User being listened to doesn't exist."
-msgstr "L'utilisateur à suivre n'existe pas."
-
-#: ../actions/remotesubscribe.php:71
-msgid "User nickname"
-msgstr "Surnom de l'utilisateur"
-
-#: ../actions/finishaddopenid.php:64
-msgid "You already have this OpenID!"
-msgstr "Vous avez déjà cet OpenID !"
-
-#: ../actions/recoverpassword.php:31
-msgid "You are already logged in!"
-msgstr "Vous êtes déjà connecté !"
-
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Vous pouvez changer ici votre mot de passe. Choisissez-en un bon !"
-
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-"Vous pouvez enlever un OpenID de votre compte en cliquant sur le bouton « "
-"Enlever »."
-
-#: ../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 personnel pour "
-"que l'on en sache plus sur vous."
-
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-msgid "You can use the local subscription!"
-msgstr "Vous pouvez utiliser l'inscription locale !"
-
-#: ../actions/openidlogin.php:67
-msgid "Your OpenID URL"
-msgstr "Votre URL OpenID"
-
-#: ../actions/openidsettings.php:28
-#, php-format
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/finishopenidlogin.php:110
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
-"[OpenID](%%doc.openid%%) vous permet de vous connecter à différents sites "
-"avec le même compte utilisateur. Gérez vos OpenID associés d'ici."
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "identique au mot de passe ci-dessus"
+"sauf ces données privées : mot de passe, adresse email, adresse de "
+"messagerie instantanée, numéro de télephone"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:105 ../lib/stream.php:109
+#: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
 msgid " from "
-msgstr ""
+msgstr "de"
 
-#: ../actions/twitapistatuses.php:470 ../actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:412
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:347
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:474 ../actions/twitapistatuses.php:482
-#: actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-#, fuzzy
-msgid "%s public timeline"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Évolution publique\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../lib/mail.php:202 ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-#, fuzzy
-msgid "%s status"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Statut de %1$s sur %2$s\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/twitapistatuses.php:335 ../actions/twitapistatuses.php:338
-#: actions/twitapistatuses.php:265
-#, php-format
-#, fuzzy
-msgid "%s timeline"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Évolution publique\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:199 ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:143 ../actions/register.php:152
-#: actions/register.php:166
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/register.php:145 ../actions/register.php:154
-#: actions/register.php:168
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"6 caractères ou plus\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Un code de confirmation a été envoyé à l'adresse que vous avez ajouté. "
-"Vousdevez approuver %s pour qu'il vous envoie des messages.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Un code de confirmation a été envoyé à l'adresse que vous avez ajouté. "
-"Vousdevez approuver %s pour qu'il vous envoie des messages.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Enlever l'OpenID\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"En attente d'une confirmation pour cette adresse. Vérifiez votre "
-"compteJabber/GTalk pour recevoir un message avec les instructions "
-"suivantes.(Avez-vous ajouté %s à votre liste de contacts ?)\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-#, fuzzy
-msgid "Can't delete this notice."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Impossible de supprimer la confirmation d'email.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Impossible de normaliser cet identifiant Jabber\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Changer de mot de passe\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Paramètres du profil\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#, fuzzy
-msgid "Confirmation code"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Pas de code de confirmation.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/register.php:188 ../actions/register.php:202
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:48 ../actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../actions/subscribe.php:62 ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../actions/subscribe.php:54 ../lib/subs.php:46 lib/subs.php:46
-#, fuzzy
-msgid "Could not subscribe."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Non inscrit !\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Adresse Jabber/GTalk actuellement confirmée.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Impossible de mettre à jour l'utilisateur.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Impossible de mettre à jour l'utilisateur.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#, fuzzy
-msgid "Current confirmed email address."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Adresse Jabber/GTalk actuellement confirmée.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-#, fuzzy
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Erreur de base de donnée en insérant la réponse : %s\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#, fuzzy
-msgid "Delete notice"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Nouveau message\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#, fuzzy
-msgid "Email Address"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Adresse email\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Paramètres\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-#, fuzzy
-msgid "Feed for tag %s"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Fil des réponses à %s\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#, fuzzy
-msgid "Incoming email address removed."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"L'adresse a été enlevée.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../lib/util.php:260 ../lib/util.php:261 lib/util.php:277
-#, php-format
-#, fuzzy
-msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Il utilise le logiciel de microblog [Laconica](http://laconi.ca/), version "
-"%s, disponible sous la licence [GNU Affero General Public License] "
-"(http://www.fsf.org/licensing/licenses/agpl-3.0.html).\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"La localisation est trop longue (255 caractères maximum).\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "%1$s / Mises à jour répondant à %2$s"
 
-#: ../actions/register.php:152 ../actions/register.php:166
-#: actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:140 ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-#, fuzzy
-msgid "New email address for posting to %s"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Pas d'adresse email définie pour cet utilisateur.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#, fuzzy
-msgid "New incoming email address added."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Ce n'est pas une adresse email valide.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#, fuzzy
-msgid "No code entered"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Pas de contenu !\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#, fuzzy
-msgid "No email address."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Adresse email\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#, fuzzy
-msgid "No incoming email address."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Ce n'est pas une adresse email valide.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#, fuzzy
-msgid "No phone number."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Il n'y a pas cet utilisateur.'\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Pas d'adresse email définie pour cet utilisateur.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#, fuzzy
-msgid "Not a registered user."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Pas de code de récupération.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#, fuzzy
-msgid "Not a valid email address"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Ce n'est pas une adresse email valide.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#, fuzzy
-msgid "Notice Search"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Recherche\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-#, fuzzy
-msgid "Notices tagged with %s"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Fil des messages de %s\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#, fuzzy
-msgid "People"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Rechercher des personnes\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Rechercher des personnes\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#, fuzzy
-msgid "Preferred language"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Préférences\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Adresse Jabber/GTalk actuellement confirmée.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Entrez un surnom ou une adresse email.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-#, fuzzy
-msgid "Registration not allowed."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Surnom non-autorisé.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/register.php:186 ../actions/register.php:200
-#: actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Paramètres de messagerie instantanée\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../lib/mail.php:215 ../lib/mail.php:219 lib/mail.php:225
-#, fuzzy
-msgid "SMS confirmation"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Pas de code de confirmation.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/register.php:147 ../actions/register.php:156
-#: actions/register.php:170
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Identique au mot de passe ci-dessus\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-msgstr ""
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#, fuzzy
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"M'envoyer des messages par Jabber/GTalk.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
-
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"M'envoyer des messages par Jabber/GTalk.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"C'est la mauvaise adresse de messagerie instantanée.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/tag.php:41 ../lib/util.php:300 ../lib/util.php:301
-#: actions/tag.php:41 lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Cet identifiant Jabber appartient déjà à un autre utilisateur.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#, fuzzy
-msgid "That is already your email address."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"C'est déjà votre identifiant Jabber.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#, fuzzy
-msgid "That is already your phone number."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"C'est déjà votre identifiant Jabber.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#, fuzzy
-msgid "That is not your email address."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"C'est la mauvaise adresse de messagerie instantanée.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#, fuzzy
-msgid "That is not your phone number."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Ce n'est pas votre identifiant Jabber.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"C'est la mauvaise adresse de messagerie instantanée.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Cet identifiant Jabber appartient déjà à un autre utilisateur.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:150 ../actions/twitapifriendships.php:163
-#: actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/twitterapi.php:248 ../lib/twitterapi.php:269
-#, fuzzy
-msgid "Unsupported type"
-msgstr "Version OMB non-supportée"
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:238 ../actions/twitapistatuses.php:241
-#: actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 ../actions/twitapistatuses.php:341
-#: actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Impossible d'enregistrer les informations du nouveau profil\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-msgstr ""
-
-#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:115 ../actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../lib/mail.php:143 ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/showstream.php:423 ../lib/stream.php:128 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr ""
-
-#: ../lib/twitterapi.php:354
-#, fuzzy
-msgid "not a supported data format"
-msgstr "Format de fichier d'image non-supporté."
-
-#: ../actions/twitapistatuses.php:692 ../actions/twitapistatuses.php:755
-#: actions/twitapistatuses.php:678
-#, fuzzy
-msgid "unsupported file type"
-msgstr ""
-"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
-"Format de fichier d'image non-supporté.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
+#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgstr "%1$s vous a invité à le joindre sur %2$s"
 
 #: ../actions/invite.php:170
 #, php-format
@@ -1508,11 +89,37 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
+"%1$s vous a invité à le joindre sur %2$s (%3$s).\n"
+"\n"
+"%2$s est un service de micro-blogging qui vous laisse garder contact avec "
+"des personnes que vous connaissez et des personnes qui vous intéressent.\n"
+"\n"
+"Vous pouvez aussi partager des nouvelles à propos de vous, vos pensées, ou "
+"votre vie en ligne avec les personnes qui vous connaissent. C'est également "
+"génial 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 la page du profil de %1$s sur %2$s ici:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Si vous souhaitez essayez ce service, cliquez sur le lien si dessous pour "
+"accepter l'invitation\n"
+"\n"
+"%6$s\n"
+"\n"
+"Sinon vous pouvez ignorer ce message. Merci de votre patience et votre "
+"temps.\n"
+"\n"
+"Cordialement, %2$s\n"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+msgstr "%1$s est occupé d'écouter vos notifications dans %2$s."
 
 #: ../lib/mail.php:126
 #, php-format
@@ -1524,55 +131,151 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
+"%1$s est occupé d'écouter vos notifications dans %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Cordialement,\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 mises à jour qui répondent aux mises à jour 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:99 actions/invite.php:123 actions/invite.php:131
 #, php-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
+#, php-format
+msgid "%s Public Stream"
+msgstr "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 "%s tableau public"
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#, php-format
+msgid "%s status"
+msgstr "Statut de %s"
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
+#, php-format
+msgid "%s timeline"
+msgstr "%s tableaux"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s mises à jour de tout le monde"
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
+"(Vous devriez recevoir un message par e-mail dans un moment, avec les "
+"instructions pour confirmer votre adresse e-mail.)"
 
-#: ../lib/util.php:257 lib/util.php:273
+#: ../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%%). "
+"**%%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/util.php:259 lib/util.php:275
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
-msgstr ""
+msgstr "**%%site.name%%** est un service de micro-blogging."
 
 #: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
+"Les contributeurs 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, pas de ponctuation ou d'espaces"
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
+"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces\n"
+"Requis."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
-msgstr ""
+msgstr "6 caractères ou plus"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
+#: actions/recoverpassword.php:220
 msgid "6 or more characters, and don't forget it!"
-msgstr ""
+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
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"Un code de confirmation a été envoyé à votre adresse de messagerie "
+"instantanée. Vous devez approuvez %s pour vous envoyer 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."
+msgstr ""
+"Un code de confirmation a été envoyé à l'adresse e-mail que vous avez "
+"ajouté. Vérifiez votre boite de réception (peut-être dans les spams) pour "
+"récupérer le code et les instructions."
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
 msgstr ""
+"Un code de confirmation a été envoyé au numéro de téléphone que vous avez "
+"ajouté. Vérifiez votre boite 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
@@ -1584,9 +287,17 @@ msgstr ""
 #: 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/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 ""
+msgstr "Méthode API non trouvée!"
 
 #: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
 #: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
@@ -1602,160 +313,422 @@ msgstr ""
 #: 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/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 ""
+msgstr "Méthode API en construction."
 
-#: ../lib/util.php:324 lib/util.php:340
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
-msgstr ""
+msgstr "À propos"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
-msgstr ""
+msgstr "Accepter"
 
 #: ../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/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 ""
+msgstr "Ajouter"
+
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
+msgid "Add OpenID"
+msgstr "Ajouter un OpenID"
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
+msgid "Add or remove OpenIDs"
+msgstr "Ajouter ou supprimer vos 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 ""
+msgstr "Adresse"
 
-#: ../actions/invite.php:131 actions/invite.php:139
+#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
 msgid "Addresses of friends to invite (one per line)"
-msgstr ""
+msgstr "Adresses d'amis à inviter (un par ligne)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:422
 msgid "All subscriptions"
-msgstr ""
+msgstr "Toutes les inscriptions"
+
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
+#, php-format
+msgid "All updates for %s"
+msgstr "Toutes les mises à jour pour %s"
+
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
+#, php-format
+msgid "All updates matching search term \"%s\""
+msgstr "Toutes les mises à jour correspondantes au terme cherché \"%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 ""
+msgstr "Déjà connecté."
 
-#: ../lib/subs.php:42 lib/subs.php:42
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
-msgstr ""
+msgstr "Déjà inscrit."
+
+#: ../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 sur de vouloir effacer cet avertissement ?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
+#: actions/userauthorization.php:81
 msgid "Authorize subscription"
-msgstr ""
+msgstr "Autoriser l'inscription"
 
 #: ../actions/login.php:104 ../actions/register.php:178
 #: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
+"Me connecter automatiquement dans le futur; déconseillé pour les ordinateurs "
+"partagés/publics!"
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"M'abonner automatiquement à quiconque s'abonne à moi (meilleur pour les non-"
+"humains)"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34
+#: 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 mis à jour."
+
+#: ../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 un message avec de plus amples instructions. "
+"(Avez-vous ajouté %s à votre liste de contacts ?)"
+
+#: ../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 un message avec de nouvelles instructions."
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+#: actions/smssettings.php:111
+msgid "Awaiting confirmation on this phone number."
+msgstr "En attente de confirmation à ce numéro de téléphone."
 
 #: ../lib/util.php:1318 lib/util.php:1452
+#, fuzzy
 msgid "Before »"
-msgstr ""
+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 ""
+msgstr "Biographie"
 
 #: ../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 ""
+msgstr "La biographie 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 cet avertissement."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
+#: actions/updateprofile.php:123
 #, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr ""
+msgstr "Impossible de lire l'URL de l'avatar '%s'"
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
+#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 msgid "Can't save new password."
-msgstr ""
+msgstr "Impossible de sauvegarder le nouveau mot de passe."
 
 #: ../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 ""
+msgstr "Annuler"
+
+#: ../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/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
 msgid "Cannot normalize that Jabber ID"
-msgstr ""
+msgstr "Impossible d'utiliser cet identifiant Jabber"
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr "Impossible d'utiliser cette adresse e-mail"
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
+msgid "Change"
+msgstr "Changer"
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr "Changer le traitement de l'email"
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Changer de mot de passe"
+
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+msgid "Change your password"
+msgstr "Changer votre mot de passe"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: lib/accountsettingsaction.php:105
+msgid "Change your profile settings"
+msgstr "Changer vos paramètres de profil"
 
 #: ../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 ""
+msgstr "Confirmer"
 
 #: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
-msgstr ""
+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/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr "Code de confirmation"
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Code de confirmation non trouvé."
+
+#: ../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 ""
+"Félicitations, %s! Bienvenue chez %%%%site.name%%%%. D'ici, vous pourriez "
+"vouloir...\n"
+"\n"
+"* Aller à [votre profil](%s) et publier votre premier message.\n"
+"* Ajouter une adresse [Jabber/GTalk](%%%%action.imsettings%%%%) et ainsi "
+"envoyez vos notifications via message instantané.\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 sur vous aux autres.\n"
+"* Parcourir la [documentation](%%%%doc.help%%%%) en ligne pour en savoir "
+"plus sur les fonctions que vous avez ratées.\n"
+"\n"
+"Merci pour votre inscription et nous vous souhaitons d'apprécier ce service."
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
+msgid "Connect"
+msgstr "Connecter"
+
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
+msgid "Connect existing account"
+msgstr "Connecté à un compte existant"
 
-#: ../lib/util.php:332 lib/util.php:348
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
-msgstr ""
+msgstr "Contact"
+
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#, php-format
+msgid "Could not create OpenID form: %s"
+msgstr "Impossible de créer le formulaire OpenID : %s"
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr ""
+msgstr "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 ""
+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 de s'abonner à vous."
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#, fuzzy
+msgid "Could not subscribe."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Non inscrit !\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+#: actions/recoverpassword.php:111
+#, fuzzy
+msgid "Could not update user with confirmed email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Adresse Jabber/GTalk actuellement confirmée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/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 ""
 
-#: ../lib/subs.php:103 lib/subs.php:116
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
-msgstr ""
+msgstr "Impossible de supprimer l'abonnement"
 
 #: ../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."
+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 ""
+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 une nouvelle inscription."
 
 #: ../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 de sauvegarder le profil."
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:279
+#, fuzzy
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Impossible de mettre à jour l'utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:440 actions/emailsettings.php:462
+#, fuzzy
+msgid "Couldn't update user record."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Impossible de mettre à jour l'utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
@@ -1765,191 +738,487 @@ msgstr ""
 #: 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 surnom."
+
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
+msgid "Create new account"
+msgstr "Créer un nouveau compte"
+
+#: ../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/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/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
+msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+#: actions/emailsettings.php:99
+#, fuzzy
+msgid "Current confirmed email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Adresse Jabber/GTalk actuellement confirmée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
 #: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, fuzzy, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Erreur de base de donnée en insérant la réponse : %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
+# De #-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n
+# Nouveau message\n
+# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
+#
+# à "Supprimer l'avis"
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+#: actions/deletenotice.php:79
+#, fuzzy
+msgid "Delete notice"
+msgstr "Supprimer l'avis"
+
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:114
 msgid "Describe yourself and your interests in 140 chars"
-msgstr ""
+msgstr "Description et intérêts (140 caractères maximum)"
 
 #: ../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: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
+#, fuzzy
+msgid "Email Address"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Adresse email\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/register.php:73 actions/register.php:80
-msgid "Email address already exists."
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+#: actions/emailsettings.php:60
+#, fuzzy
+msgid "Email Settings"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Paramètres\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/mail.php:90 lib/mail.php:90
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+msgid "Email address already exists."
+msgstr "Cette adresse email est déjà utilisée."
+
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
-msgstr ""
+msgstr "Adresse email de confirmation"
 
-#: ../actions/invite.php:129 actions/invite.php:137
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Adresse email (ex: nom@mondomaine.fr)"
+
+#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
 msgid "Email addresses"
-msgstr ""
+msgstr "Adresses email"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:231
 msgid "Enter a nickname or email address."
-msgstr ""
+msgstr "Entrer un pseudo ou une adresse email."
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+#: actions/smssettings.php:119
+msgid "Enter the code you received on your phone."
+msgstr "Entrer le code que vous avez reçu sur votre téléphone."
 
 #: ../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 ""
+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 de connexion d'utilisateur."
+
+#: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+msgid "Error inserting avatar"
+msgstr "Erreur lors de l'insertion d'un avatar"
+
+#: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+msgid "Error inserting new profile"
+msgstr "Erreur lors de l'insertion d'un nouveau profil"
+
+#: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+msgid "Error inserting remote profile"
+msgstr "Erreur lors de l'insertion d'un profil distant"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
-msgstr ""
+msgstr "Erreur lors de la sauvegarde de l'email de confirmation."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
 msgid "Error saving remote profile"
-msgstr ""
+msgstr "Erreur lors de la sauvegarde du profil distant"
 
-#: ../lib/openid.php:226 lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving the profile."
-msgstr ""
+msgstr "Erreur lors de la sauvegarde 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/register.php:108 actions/login.php:112 actions/login.php:138
+#: actions/recoverpassword.php:354 actions/register.php:198
 msgid "Error setting user."
-msgstr ""
+msgstr "Erreur dans les options de l'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/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/recoverpassword.php:80 actions/recoverpassword.php:80
+#: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
-msgstr ""
+msgstr "Erreur dans le code de confirmation."
 
-#: ../lib/util.php:326 lib/util.php:342
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
+msgid "Existing nickname"
+msgstr "Surnom existant"
+
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
-msgstr ""
+msgstr "FAQ"
+
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
+msgid "Failed updating avatar."
+msgstr "La mise à jour de l'avatar a échoué."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64
+#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
 #, php-format
 msgid "Feed for friends of %s"
 msgstr ""
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66
+#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
+#: actions/repliesrss.php:71
 #, php-format
 msgid "Feed for replies to %s"
 msgstr ""
 
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, fuzzy, php-format
+msgid "Feed for tag %s"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Fil des réponses à %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+#: 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 "Trouver 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é, merci de rentrer à nouveau votre nom "
+"d'utilisateur et votre mot de passe avant de sauvegarde 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 ""
+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 ""
+msgstr "Nom complet trop long (maximum de 255 caractères)."
 
-#: ../lib/util.php:322 lib/util.php:338
+#: ../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/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
-msgstr ""
+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 ""
+msgstr "Page d'accueil"
 
 #: ../actions/profilesettings.php:95 ../actions/register.php:76
 #: actions/profilesettings.php:210 actions/register.php:83
+#: actions/editgroup.php:192 actions/newgroup.php:143
+#: actions/profilesettings.php:199 actions/register.php:168
 msgid "Homepage is not a valid URL."
-msgstr ""
+msgstr "Page d'accueil non 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 des avis par email."
+
+#: ../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 instantanné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, connectez-vous avec votre nom d'utilisateur 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 ""
+"Si vous voulez 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 vous en faire "
+"envoyé un nouveau sur l'email correspondant à votre compte."
 
-#: ../actions/login.php:67 actions/login.php:67
-msgid "Incorrect username or password."
+#: ../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
+#, fuzzy
+msgid "Incoming email address removed."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"L'adresse a été enlevée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../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 "Nom d'utilisateur ou mot de passe incorrect."
 
 #: ../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 viennent d'être envoyé "
+"par email à l'adresse email indiquée dans votre compte."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
-msgstr ""
+msgstr "URL de l'avatar invalide: '%s'"
 
-#: ../actions/invite.php:55 actions/invite.php:62
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
 #, php-format
 msgid "Invalid email address: %s"
-msgstr ""
+msgstr "Adresse email invalide: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
-msgstr ""
+msgstr "Page d'accueil invalide '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
-msgstr ""
+msgstr "URL de la licence invalide '%s'"
+
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
+msgid "Invalid notice content"
+msgstr "Contenu du message invalide"
+
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72
+msgid "Invalid notice uri"
+msgstr "URI du message invalide"
+
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
+msgid "Invalid notice url"
+msgstr "URL du message invalide"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
-msgstr ""
+msgstr "URL du profil invalide '%s'."
+
+#: ../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/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
+msgid "Invalid profile URL returned by server."
+msgstr "URL du profil retourné par le serveur invalide."
+
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Taille invalide."
 
 #: ../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 ""
+msgstr "Nom d'utilisateur ou mot de passe invalide."
 
-#: ../actions/invite.php:79 actions/invite.php:86
+#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
 msgid "Invitation(s) sent"
-msgstr ""
+msgstr "Invitation(s) envoyée(s)"
 
-#: ../actions/invite.php:97 actions/invite.php:104
+#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
 msgid "Invitation(s) sent to the following people:"
-msgstr ""
+msgstr "Invitation(s) envoyée(s) aux personnes suivantes:"
 
-#: ../lib/util.php:306 lib/util.php:322
+#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
+#: lib/subgroupnav.php:103
 msgid "Invite"
-msgstr ""
+msgstr "Inviter"
 
-#: ../actions/invite.php:123 actions/invite.php:130
+#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
 msgid "Invite new users"
+msgstr "Inviter de nouveau utilisateurs"
+
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#, fuzzy, php-format
+msgid ""
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Il utilise le logiciel de microblog [Laconica](http://laconi.ca/), version %"
+"s, disponible sous la licence [GNU Affero General Public License] (http://"
+"www.fsf.org/licensing/licenses/agpl-3.0.html).\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: actions/imsettings.php:296
 msgid "Jabber ID already belongs to another user."
-msgstr ""
+msgstr "ID Jabber déjà utilisé par un autre utilisateur."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
@@ -1957,130 +1226,339 @@ 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.fr). Tout d'abord, ajouter bien %"
+"s à votre liste d'amis dans votre client de messagerie instantanée ou dans "
+"GTalk."
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:128
+msgid "Language"
+msgstr "Langue"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:217
+#, fuzzy
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"La langue est trop longue (255 caractères maximum).\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\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 ""
+msgstr "Localisation"
 
 #: ../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 ""
+msgstr "Localisation trop longue (maximum de 255 caractères)."
 
 #: ../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 ""
+msgstr "Se connecter"
+
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "Se connecter avec un compte [OpenID](%%doc.openid%%)."
 
 #: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
+"Se connecter avec un nom d'utilisateur et un mot de passe. Pas encore "
+"inscrit ? [Register](%%action.register%%) un nouveau compte, ou essayer "
+"[OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:308 lib/util.php:324
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
+msgstr "Déconnexion"
+
+#: ../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:110 actions/login.php:110 actions/login.php:245
+#: lib/facebookaction.php:320
 msgid "Lost or forgotten password?"
+msgstr "Mot de passe perdu ou oublié?"
+
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php: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 "Membre depuis"
+
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#, php-format
+msgid "Microblog by %s"
+msgstr "Microblog par %s"
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/finishopenidlogin.php:107 actions/register.php:429
 msgid "My text and files are available under "
-msgstr ""
+msgstr "Mes textes et mes fichiers sont disponibles sous"
+
+#: ../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
+#, fuzzy, php-format
+msgid "New email address for posting to %s"
+msgstr "Nouvelle adresse email pour envoyer à %s"
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:465
+#, fuzzy
+msgid "New incoming email address added."
+msgstr "Nouvelle adresse email ajoutée."
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+#: actions/finishopenidlogin.php:99
+msgid "New nickname"
+msgstr "Nouveau surnom"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
-msgstr ""
+msgstr "Nouveau message"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
+#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
 msgid "New password"
-msgstr ""
+msgstr "Nouveau mot de passe"
 
 #: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
-msgstr ""
+msgstr "Nouveau mot de passe créé avec succès. Vous êtes maintenant connecté."
 
 #: ../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 ""
+msgstr "Pseudo"
 
 #: ../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 ""
+msgstr "Pseudo déjà utilisé. Essayer en un autre"
 
 #: ../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 nombres "
+"et aucuns espaces."
+
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
+msgid "Nickname not allowed."
+msgstr "Pseudo non-autorisé."
+
+#: ../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 à surveiller"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
-msgstr ""
+msgstr "Pseudo ou email"
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
+msgid "No"
+msgstr "Non"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
+#: actions/imsettings.php:279
 msgid "No Jabber ID."
-msgstr ""
+msgstr "Pas d'ID Jabber"
 
 #: ../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
+#, fuzzy
+msgid "No code entered"
+msgstr "Pas de code entré"
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Pas de code de confirmation."
+
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
+#: actions/newnotice.php:126 classes/Command.php:223
 msgid "No content!"
-msgstr ""
+msgstr "Pas de contenu!"
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:304
+#, fuzzy
+msgid "No email address."
+msgstr "Pas d'adresse email."
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32
+#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
 msgid "No id."
-msgstr ""
+msgstr "Pas d'id."
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:430
+#, fuzzy
+msgid "No incoming email address."
+msgstr "Pas d'adresse email."
+
+#: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
+msgid "No nickname provided by remote server."
+msgstr "Pas de surnom proposé par le serveur distant."
+
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+msgid "No nickname."
+msgstr "Pas de surnom."
 
 #: ../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 ""
+msgstr "Aucune confirmation en attente pour l'annulation."
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+#: actions/smssettings.php:294
+#, fuzzy
+msgid "No phone number."
+msgstr "Pas de numéro de téléphone."
+
+#: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
+msgid "No profile URL returned by server."
+msgstr "Pas d'URL de profil retourné par le serveur."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+#: actions/recoverpassword.php:266
 msgid "No registered email address for that user."
-msgstr ""
+msgstr "Pas d'email enregistré pour cet utilisateur."
 
 #: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
 msgid "No request found!"
-msgstr ""
+msgstr "Requête non 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 "Pas de résultats"
+
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Pas de taille."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
+#: actions/twitapistatuses.php:446
 msgid "No status found with that ID."
-msgstr ""
+msgstr "Pas de status trouvés avec cet ID."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
 msgid "No status with that ID found."
-msgstr ""
+msgstr "Pas de status avec cet ID trouvé."
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
+#: actions/openidsettings.php:222
+msgid "No such OpenID."
+msgstr "Il n'y a pas cet OpenID."
+
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+msgid "No such document."
+msgstr "Il n'y a pas ce document."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
+#: lib/deleteaction.php:51
 msgid "No such notice."
-msgstr ""
+msgstr "Il n'y a pas cet avis."
+
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Il n'y a pas ce code de récupération."
+
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
+#: actions/postnotice.php:60
+msgid "No such subscription"
+msgstr "Il n'y a pas cette inscription"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
 #: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
@@ -2097,36 +1575,110 @@ msgstr ""
 #: 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
+#: 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 ""
+msgstr "Il n'y a pas cet utilisateur"
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+#: actions/recoverpassword.php:251
+#, fuzzy
+msgid "No user with that email address or username."
+msgstr "Pas d'utilisateur avec cet email ou ce nom d'utilisateur"
 
 #: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
-msgstr ""
+msgstr "Personne à montrer!"
+
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Ce n'est pas un code de récupération."
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+#: scripts/maildaemon.php:53
+#, fuzzy
+msgid "Not a registered user."
+msgstr "Ce 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:502 lib/twitterapi.php:448 lib/twitterapi.php:476
+#: lib/twitterapi.php:566
 msgid "Not a supported data format."
-msgstr ""
+msgstr "Ce n'est pas un format supporté."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
+#: actions/imsettings.php:290
 msgid "Not a valid Jabber ID"
+msgstr "Ce n'est pas un ID Jabber valide"
+
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+msgid "Not a valid OpenID."
+msgstr "Ce n'est pas un OpenID valide."
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:315
+#, fuzzy
+msgid "Not a valid email address"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Ce n'est pas une adresse email valide.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/register.php:63 actions/register.php:70
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
 msgid "Not a valid email address."
-msgstr ""
+msgstr "Ce n'est pas une adresse email valide."
 
 #: ../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 ""
+msgstr "Ce n'est pas un pseudo valide."
+
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:159
+msgid "Not a valid profile URL (incorrect services)."
+msgstr "Ce n'est pas un URL de profil valide (services incorrects)."
+
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+#: actions/remotesubscribe.php:152
+msgid "Not a valid profile URL (no XRDS defined)."
+msgstr "Ce n'est pas un URL de profil valide (pas de 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 "Ce n'est pas un URL de profil valide (pas de document YADIS)."
+
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
+msgid "Not an image or corrupt file."
+msgstr "Ce n'est pas une image, ou c'est un fichier corrompu."
+
+#: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
+msgid "Not authorized."
+msgstr "Non autorisé."
+
+#: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+msgid "Not expecting this response!"
+msgstr "Cette réponse n'était pas attendue !"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:309
 msgid "Not found"
-msgstr ""
+msgstr "Pas trouvé"
 
 #: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
 #: ../actions/newnotice.php:29 ../actions/subscribe.php:28
@@ -2135,64 +1687,196 @@ msgstr ""
 #: 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
+#: 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 ""
+msgstr "Non connecté."
 
-#: ../lib/subs.php:91 lib/subs.php:104
+#: ../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
+#, fuzzy
+msgid "Notice Search"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Recherche\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../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 "Fil des messages de %s"
+
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:94
+msgid "Notice has no profile"
+msgstr "Le message 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 "Messages"
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81 actions/tag.php:41
+#, fuzzy, php-format
+msgid "Notices tagged with %s"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Fil des messages de %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
+msgid "Old password"
+msgstr "Ancien mot de passe"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330
+#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
+#: lib/logingroupnav.php:81
 msgid "OpenID"
-msgstr ""
+msgstr "OpenID"
+
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73
+msgid "OpenID Account Setup"
+msgstr "Mise en place 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/invite.php:135 actions/invite.php:143
+#: ../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ée : %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 enlevé."
+
+#: ../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 ""
+msgstr "Ajouter un message personnel à l'invitation (optionnel)"
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
+msgid "Partial upload."
+msgstr "Transfert partiel."
 
 #: ../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/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 ""
+msgstr "Mot de passe"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:335
 msgid "Password and confirmation do not match."
-msgstr ""
+msgstr "Le mot de passe et la confirmation sont différents."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+#: actions/recoverpassword.php:331
 msgid "Password must be 6 chars or more."
-msgstr ""
+msgstr "Le mot de passe doit être composés d'au moins 6 caractères."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
 msgid "Password recovery requested"
-msgstr ""
+msgstr "Demande de nouveau mot de passe demandée"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 msgid "Password saved."
-msgstr ""
+msgstr "Mot de passe sauvegardé."
 
 #: ../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."
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+#: lib/searchgroupnav.php:80
+#, fuzzy
+msgid "People"
+msgstr "Personne"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#: actions/opensearch.php:64
+#, fuzzy
+msgid "People Search"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Recherche de personne#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-"
+"#\n"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Rechercher des personnes"
 
-#: ../lib/stream.php:50 lib/personal.php:50
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
-msgstr ""
+msgstr "Personnel"
 
-#: ../actions/invite.php:133 actions/invite.php:141
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
 msgid "Personal message"
+msgstr "Message personnel"
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
+"Numéro de téléphone, pas de ponctuation ou d'espace, avec le code "
+"international."
 
 #: ../actions/userauthorization.php:78
 msgid ""
@@ -2202,186 +1886,532 @@ msgid ""
 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/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/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
-msgstr ""
+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 sauvegardées"
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:129
+#, fuzzy
+msgid "Preferred language"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Préférences de la langue#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-"
+"#-#\n"
 
-#: ../lib/util.php:328 lib/util.php:344
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
 msgid "Privacy"
-msgstr ""
+msgstr "Confidentialité"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119
+#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
 msgid "Problem saving notice."
-msgstr ""
+msgstr "Problème lors de la sauvegarde du message."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84
+#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
+#: lib/personalgroupnav.php:108
 msgid "Profile"
-msgstr ""
+msgstr "Profile"
+
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
+msgid "Profile URL"
+msgstr "URL du profil"
+
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
+msgid "Profile settings"
+msgstr "Paramètres du profil"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
+#: actions/postnotice.php:55 actions/updateprofile.php:56
 msgid "Profile unknown"
-msgstr ""
+msgstr "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 "Évolution publique"
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Publier un MicroID pour mon adresse Jabber/GTalk."
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+#, fuzzy
+msgid "Publish a MicroID for my email address."
+msgstr "Publier un MicroID pour mon adresse email."
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr "Tags recents"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
-msgstr ""
+msgstr "Récupérer"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198
 msgid "Recover password"
-msgstr ""
+msgstr "Récupérer le mot de passe"
+
+#: ../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 ""
+msgstr "Inscription"
+
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+#, fuzzy
+msgid "Registration not allowed."
+msgstr "Inscription non autorisée."
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr "Inscription effectuée avec succès"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
-msgstr ""
+msgstr "Refusé"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190
+#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414
 msgid "Remember me"
-msgstr ""
+msgstr "Se souvenir de moi"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
 msgstr ""
 
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
+msgid "Remote subscribe"
+msgstr "Inscription distante"
+
 #: ../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/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 "Enlever"
+
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
+msgid "Remove OpenID"
+msgstr "Enlever l'OpenID"
+
+#: ../actions/openidsettings.php:73
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
 msgstr ""
+"Enlever votre seul OpenID vous empêcherai de vous connecter ! Si vous avez "
+"besoin de l'enlever, ajoutez un autre OpenID d'abord."
 
-#: ../lib/stream.php:55 lib/personal.php:55
+#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
 msgid "Replies"
-msgstr ""
+msgstr "Réponses"
 
 #: ../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 ""
+msgstr "Réponses à %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
-msgstr ""
+msgstr "Réinitialiser"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
+msgstr "Réinitialiser mon mot de passe"
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
 msgstr ""
 
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+#, fuzzy
+msgid "SMS Settings"
+msgstr "Paramètres SMS"
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#, fuzzy
+msgid "SMS confirmation"
+msgstr "Confirmation SMS"
+
 #: ../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/register.php:156 actions/register.php:170
+#: actions/register.php:377
+#, fuzzy
+msgid "Same as password above. Required."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Identique au mot de passe ci-dessus. Requis.#-#-#-#-#  laconica.new.pot "
+"(PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../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/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 ""
+msgstr "Sauvegarder"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316
+#: lib/util.php:316 lib/action.php:325
 msgid "Search"
+msgstr "Rechercher"
+
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
+msgid "Search Stream Feed"
+msgstr "Fil du flux de recherche"
+
+#: ../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 ""
+"Recherche des messages sur %%site.name%% par leur contenu. Séparez les "
+"termes de la recherches par des espaces ; ils doivent être de 3 caractères "
+"ou plus."
+
+#: ../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 ""
+"Recherche de personne sur %%site.name%% par leur nom, localisation ou "
+"intérêt. Séparez les termes de la recherches par des espaces ; ils doivent "
+"être de 3 caractères ou plus."
+
+#: ../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
+#: 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
+#, fuzzy
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"M'envoyer des messages par Jabber/GTalk.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
+#: actions/imsettings.php:137
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: ../lib/util.php:304 lib/util.php:320
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"M'envoyer des messages par Jabber/GTalk.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../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 ""
 
-#: ../lib/util.php:330 lib/util.php:346
+#: ../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 "Quelqu'un d'autre a 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 ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+#: scripts/maildaemon.php:57
+#, fuzzy
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est la mauvaise adresse de messagerie instantanée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../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 ""
 
 #: ../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 "Erreur système en transférant le fichier."
+
+#: ../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 "Texte cherché"
+
+#: ../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/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/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/emailsettings.php:191 actions/emailsettings.php:209
+#, fuzzy
+msgid "That email address already belongs to another user."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Cet identifiant Jabber appartient déjà à un autre utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
+msgid "That file is too big."
+msgstr "Ce fichier est trop gros."
+
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr ""
 
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+#, fuzzy
+msgid "That is already your email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est déjà votre identifiant Jabber.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+#, fuzzy
+msgid "That is already your phone number."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est déjà votre identifiant Jabber.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr ""
 
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:397
+#, fuzzy
+msgid "That is not your email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est la mauvaise adresse de messagerie instantanée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+#: actions/smssettings.php:393
+#, fuzzy
+msgid "That is not your phone number."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Ce n'est pas votre identifiant Jabber.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
 #: ../actions/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/smssettings.php:233 actions/smssettings.php:241
+#: actions/smssettings.php:362
+#, fuzzy
+msgid "That is the wrong confirmation number."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est la mauvaise adresse de messagerie instantanée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+#: actions/smssettings.php:309
+#, fuzzy
+msgid "That phone number already belongs to another user."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Cet identifiant Jabber appartient déjà à un autre utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
 #: ../actions/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/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:62
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
@@ -2393,6 +2423,8 @@ 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 ""
 
@@ -2410,26 +2442,67 @@ msgid ""
 "subscription."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "Ce sont les personnes qui suivent les messages de %s."
+
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
+msgid "These are the people who listen to your notices."
+msgstr "Ce sont les personnes qui suivent vos messages."
+
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "Ce sont les personnes dont les messages sont suivis par %s."
+
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+msgid "These are the people whose notices you listen to."
+msgstr "Ce sont les personnes dont vous suivez les messages."
+
+#: ../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:"
+"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 ""
+"Ce formulaire devrait se transmettre automatiquement. Si ce n'est pas le "
+"cas, cliquez sur le bouton de soumission pour aller chez 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 ""
+"Ce la première fois que vous vous êtes connectés à %s, donc nous devons "
+"connecter votre OpenID à un compte local. Vous pouvez soit créer un nouveau "
+"compte, soit vous connectez avec un compte existant, si vous en avez "
+
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
+#: 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/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 ""
 
@@ -2437,42 +2510,147 @@ msgstr ""
 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/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 ""
+"Pour s'inscrire, vous pouvez [vous connecter](%%action.login%%), ou [créer "
+"unnouveau compte](%%action.register%%). Si vous avez déjà un compte sur un "
+"[site de microblog 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 ""
+
 #: ../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 de votre profil sur un autre service de microblog 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/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 "Version inconnue du protocole OMB"
+
 #: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
 
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Type d'adresse non reconnu : %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 ""
 
-#: ../actions/invite.php:114 actions/invite.php:121
+#: ../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é."
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "Transfert."
+
+#: ../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 ""
+"Transférez ici un nouvel « avatar » (image 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 soumise à la licence du site. Utilisez "
+"une image qui vous appartient et que vous voulez partager."
+
+#: ../lib/settingsaction.php:91
+#, fuzzy
+msgid "Upload a new profile image"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Impossible d'enregistrer les informations du nouveau profil\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/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."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
@@ -2480,6 +2658,11 @@ msgstr ""
 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 "L'utilisateur à suivre 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
@@ -2490,60 +2673,164 @@ msgstr ""
 #: 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/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
+msgid "User nickname"
+msgstr "Surnom de l'utilisateur"
+
 #: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
 msgid "User not found."
 msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %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\""
 msgstr ""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
+#: ../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 "Vous avez déjà cet 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 "Vous êtes déjà connecté !"
+
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
 msgid "You are already subscribed to these users:"
 msgstr ""
 
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/password.php:27
+msgid "You can change your password here. Choose a good one!"
+msgstr "Vous pouvez changer ici votre mot de passe. Choisissez-en un bon !"
+
 #: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr ""
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../actions/openidsettings.php:86
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Vous pouvez enlever un OpenID de votre compte en cliquant sur le bouton « "
+"Enlever »."
+
+#: ../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 personnel pour "
+"que l'on en sache plus sur vous."
+
+#: ../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'inscription 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 ""
 
 #: ../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
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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: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/invite.php:103 actions/invite.php:110
+#: ../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!"
@@ -2553,66 +2840,99 @@ msgstr ""
 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 "Votre URL OpenID"
+
 #: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992
+#: ../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%%) vous permet de vous connecter à différents sites "
+"avec le même compte utilisateur. Gérez vos OpenID associés d'ici."
+
+#: ../lib/util.php: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:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002
+#: ../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: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: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: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: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/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/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 "identique au mot de passe ci-dessus"
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:555
+#, fuzzy
+msgid "unsupported file type"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Format de fichier d'image non-supporté.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
 #: ../lib/util.php:1309 lib/util.php:1443
 msgid "« After"
 msgstr ""
@@ -2626,18 +2946,22 @@ msgstr ""
 #: 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:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr ""
 
-#: actions/disfavor.php:63
+#: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr ""
 
-#: actions/disfavor.php:72
+#: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
 msgstr ""
 
@@ -2645,16 +2969,18 @@ msgstr ""
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: actions/emailsettings.php:95
+#: 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: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
+#: classes/Command.php:132 actions/favor.php:86
+#: actions/twitapifavorites.php:125 classes/Command.php:152
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2663,86 +2989,91 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: actions/inbox.php:28
+#: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
 msgstr ""
 
-#: actions/inbox.php:30
+#: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 msgstr ""
 
-#: actions/inbox.php:53
+#: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: actions/invite.php:178
+#: 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/login.php:104
+#: 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:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: 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 ""
 
-#: actions/newmessage.php:65
+#: 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
+#: 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
+#: 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."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
 msgstr ""
 
-#: actions/openidsettings.php:28
+#: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: actions/openidsettings.php:46
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
@@ -2750,64 +3081,67 @@ msgstr ""
 msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: actions/openidsettings.php:87
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: actions/outbox.php:28
+#: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: actions/outbox.php:30
+#: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr ""
 
-#: actions/outbox.php:53
+#: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: actions/peoplesearch.php:28
+#: 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/profilesettings.php:27
+#: 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:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
 msgstr ""
 
-#: actions/recoverpassword.php:141
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: actions/recoverpassword.php:154
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
 msgstr ""
 
-#: actions/recoverpassword.php:169
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
 msgstr ""
 
-#: actions/recoverpassword.php:271
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
 msgstr ""
 
-#: actions/recoverpassword.php:327
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -2822,21 +3156,22 @@ msgstr ""
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: 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:61 actions/showfavorites.php:145
 #, php-format
 msgid "Feed for favorites of %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 ""
 
-#: actions/showmessage.php:33
+#: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
 msgstr ""
 
@@ -2844,12 +3179,12 @@ msgstr ""
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: actions/showmessage.php:61
+#: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: actions/showmessage.php:66
+#: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
@@ -2858,58 +3193,63 @@ msgstr ""
 msgid "Send a message"
 msgstr ""
 
-#: actions/smssettings.php:312
+#: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #, 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."
 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/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
 msgid "%s updates favorited by %s / %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 ""
 
 #: 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"
@@ -2921,15 +3261,15 @@ msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2937,7 +3277,7 @@ msgstr ""
 msgid "Twitter Username"
 msgstr ""
 
-#: actions/twittersettings.php:65
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgid "No spaces, please."
 msgstr ""
 
@@ -2945,15 +3285,15 @@ msgstr ""
 msgid "Twitter Password"
 msgstr ""
 
-#: actions/twittersettings.php:72
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: actions/twittersettings.php:75
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: actions/twittersettings.php:78
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
@@ -2963,7 +3303,7 @@ msgid ""
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -2973,160 +3313,166 @@ 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!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: 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: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:245 actions/twittersettings.php:461
 msgid "Twitter preferences saved."
 msgstr ""
 
-#: actions/userauthorization.php:84
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
 msgstr ""
 
-#: actions/userauthorization.php:324
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: actions/userauthorization.php:334
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:204
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:215
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39
+#: classes/Command.php:39 classes/Command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: classes/Command.php:96
+#: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: 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:146 classes/Command.php:166
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166
+#: classes/Command.php:166 classes/Command.php:189
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: classes/Command.php:169
+#: classes/Command.php:169 classes/Command.php:192
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
-#: classes/Command.php:172
+#: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
-#: classes/Command.php:175
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178
+#: classes/Command.php:178 classes/Command.php:201
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:228
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:300
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:307
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: 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:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: 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:313 classes/Command.php:356
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:358
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:379
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:381
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53
+#: classes/Message.php:53 classes/Message.php:56
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63
+#: classes/Message.php:63 classes/Message.php:66
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -3134,74 +3480,1653 @@ msgstr ""
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:289
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:508
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:512
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43
+#: 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:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: lib/personal.php:65
+#: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
 msgstr ""
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
 msgstr ""
 
-#: lib/personal.php:75
+#: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
 msgstr ""
 
-#: lib/personal.php:76
+#: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
 msgstr ""
 
-#: lib/personal.php:80
+#: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
 msgstr ""
 
-#: lib/personal.php:81
+#: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgid "To"
 msgstr ""
 
-#: scripts/maildaemon.php:45
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s et ses amis"
+
+#: actions/avatarsettings.php:76
+msgid "You can upload your personal avatar."
+msgstr ""
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Paramètres de messagerie instantanée"
+
+#: 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
+#, fuzzy
+msgid "Lost our file."
+msgstr "Il n'y a pas cet OpenID."
+
+#: 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 ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Format de fichier d'image non-supporté.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: 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
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Vous êtes déjà connecté !"
+
+#: 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 "Cette adresse a déjà été confirmée."
+
+#: actions/deletenotice.php:73
+#, fuzzy
+msgid "You are about to permanently delete a notice. "
+msgstr "Êtes-vous sur de vouloir effacer cet avertissement ?"
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
+#, 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"
+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
+#, fuzzy
+msgid "No nickname"
+msgstr "Pas de surnom."
+
+#: 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 "Il n'y a pas ce document.'"
+
+#: 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 ""
+
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
+msgstr ""
+"Les pseudos ne peuvent contenir que des caractères minuscules et des nombres "
+"et aucuns espaces."
+
+#: actions/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "La biographie est trop longue (140 caractères maximum)."
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Impossible de mettre à jour l'utilisateur."
+
+#: actions/editgroup.php:226
+msgid "Options saved."
+msgstr ""
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "En attente de confirmation à ce numéro de téléphone."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#, fuzzy
+msgid "Make a new email address for posting to; "
+msgstr "Nouvelle adresse email pour envoyer à %s"
+
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
+msgstr ""
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/emailsettings.php:321
+#, fuzzy
+msgid "That email address already belongs "
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Cet identifiant Jabber appartient déjà à un autre utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
+msgstr ""
+"Un code de confirmation a été envoyé à votre adresse de messagerie "
+"instantanée. Vous devez approuvez %s pour vous envoyer des messages."
+
+#: 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 ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, 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 "Pas de contenu!"
+
+#: 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
+#, fuzzy
+msgid "Before"
+msgstr "Avant »"
+
+#: actions/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:72
+#, fuzzy
+msgid "Invitations have been sent to the following users:"
+msgstr "Invitation(s) envoyée(s) aux personnes suivantes:"
+
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
+msgstr ""
+
+#: actions/facebookinvite.php:105
+#, php-format
+msgid "Invite your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
+msgstr ""
+
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Impossible de créer l'inscription."
+
+#: actions/facebooksettings.php:65
+msgid "There was a problem saving your sync preferences!"
+msgstr ""
+
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Préférences sauvegardées"
+
+#: actions/facebooksettings.php:90
+msgid "Automatically update my Facebook status with my notices."
+msgstr ""
+
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
+msgstr ""
+
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Profile"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
+msgstr ""
+
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Préférences"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.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
+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/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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Avatar mis à jour."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "La mise à jour de l'avatar a échoué."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+msgstr ""
+
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#, fuzzy
+msgid "Create a new group"
+msgstr "Créer un nouveau compte"
+
+#: actions/groupsearch.php:57
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+msgstr ""
+"Recherche de personne sur %%site.name%% par leur nom, localisation ou "
+"intérêt. Séparez les termes de la recherches par des espaces ; ils doivent "
+"être de 3 caractères ou plus."
+
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "Rechercher des personnes"
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
+msgstr ""
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk "
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"M'envoyer des messages par Jabber/GTalk.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Pas de code de confirmation."
+
+#: actions/joingroup.php:65
+msgid "You must be logged in to join a group."
+msgstr ""
+
+#: actions/joingroup.php:95
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Vous êtes déjà connecté !"
+
+#: actions/joingroup.php:128
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Impossible de suivre l'utilisateur: Utilisateur non trouvé."
+
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "No such group."
+msgstr "Il n'y a pas ce document.'"
+
+#: 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
+#, fuzzy
+msgid "Could not find membership record."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Impossible de mettre à jour l'utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Impossible de suivre l'utilisateur: Utilisateur non trouvé."
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "Could not create group."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Non inscrit !\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Impossible de créer l'inscription."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "Ce fichier est trop gros."
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
+msgstr ""
+
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Recherche\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
+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/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "Connexion OpenID"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Enlever l'OpenID"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Paramètres de messagerie instantanée"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:112
+msgid "Service"
+msgstr ""
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"La localisation est trop longue (255 caractères maximum).\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Changer votre mot de passe"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "Mot de passe sauvegardé."
+
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Ce n'est pas une adresse email valide.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:91
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "Profil inconnu"
+
+#: actions/profilesettings.php:124
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:144
+#, fuzzy
+msgid "Automatically subscribe to whoever "
+msgstr ""
+"M'abonner automatiquement à quiconque s'abonne à moi (meilleur pour les non-"
+"humains)"
+
+#: actions/profilesettings.php:229 actions/tagother.php:176
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Taille invalide."
+
+#: actions/profilesettings.php:311
+msgid "Couldn't save tags."
+msgstr ""
+
+#: actions/public.php:107
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Évolution publique"
+
+#: actions/public.php:173
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Non inscrit !\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/public.php:220
+#, 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 "Fil du flux public"
+
+#: actions/publictagcloud.php:63
+#, 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
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, "
+msgstr "1-64 lettres minuscules ou chiffres, pas de ponctuation ou d'espaces"
+
+#: 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
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Description et intérêts (140 caractères maximum)"
+
+#: actions/register.php:410
+msgid "Where you are, like \"City, "
+msgstr ""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+msgstr ""
+"sauf ces données privées : mot de passe, adresse email, adresse de "
+"messagerie instantanée, numéro de télephone"
+
+#: actions/register.php:471
+#, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr ""
+
+#: 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
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Réponses à %s"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
+msgstr ""
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
+
+#: actions/showgroup.php:206
+#, fuzzy
+msgid "Group profile"
+msgstr "Il n'y a pas cet OpenID."
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
+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 "Messages"
+
+#: actions/showgroup.php:270
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Fil des messages de %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
+msgid "Members"
+msgstr "Membre depuis"
+
+#: 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/showgroup.php:370
+msgid "All members"
+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 "
+msgstr ""
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
+msgstr ""
+
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
+msgstr ""
+
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Profile"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "Il n'y a pas cet OpenID."
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Toutes les inscriptions"
+
+#: actions/showstream.php:533
+msgid "All groups"
+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 "
+msgstr ""
+
+#: actions/smssettings.php:128
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, "
+msgstr ""
+"Numéro de téléphone, pas de ponctuation ou d'espace, avec le code "
+"international."
+
+#: actions/smssettings.php:162
+#, fuzzy
+msgid "Send me notices through SMS; "
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"M'envoyer des messages par Jabber/GTalk.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/smssettings.php:335
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. "
+msgstr "En attente de confirmation à ce numéro de téléphone."
+
+#: actions/smssettings.php:453
+msgid "Mobile carrier"
+msgstr ""
+
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+msgstr ""
+
+#: actions/subedit.php:83
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Impossible de créer l'inscription."
+
+#: actions/subscribe.php:55
+#, fuzzy
+msgid "Not a local user."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Pas de code de récupération.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/subscribe.php:69
+#, fuzzy
+msgid "Subscribed"
+msgstr "Inscription distante"
+
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Inscription distante"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr ""
+
+#: actions/subscribers.php:63
+#, fuzzy
+msgid "These are the people who listen to "
+msgstr "Ce sont les personnes qui suivent les messages de %s."
+
+#: actions/subscribers.php:67
+#, fuzzy, php-format
+msgid "These are the people who "
+msgstr "Ce sont les personnes qui suivent les messages de %s."
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Toutes les inscriptions"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Toutes les inscriptions"
+
+#: actions/subscriptions.php:65
+#, fuzzy
+msgid "These are the people whose notices "
+msgstr "Ce sont les personnes dont les messages sont suivis par %s."
+
+#: actions/subscriptions.php:69
+#, fuzzy, php-format
+msgid "These are the people whose "
+msgstr "Ce sont les personnes qui suivent les messages de %s."
+
+#: actions/subscriptions.php:122
+msgid "Jabber"
+msgstr "Jabber"
+
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Fil des messages de %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/tag.php:66
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+msgstr ""
+
+#: actions/tagother.php:33
+msgid "Not logged in"
+msgstr ""
+
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No id argument."
+msgstr "Il n'y a pas ce document.'"
+
+#: actions/tagother.php:65
+#, 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."
+msgstr ""
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:198
+#, fuzzy
+msgid "Could not save tags."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Non inscrit !\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/tagother.php:233
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "Il n'y a pas ce document.'"
+
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Fil des messages de %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+msgid "Not found."
+msgstr ""
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Changer de mot de passe"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
+msgstr ""
+
+#: actions/twittersettings.php:341
+#, php-format
+msgid "Unable to retrieve account information "
+msgstr ""
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Erreur lors de l'enregistrement de l'utilisateur."
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Pas d'URL de profil retourné par le serveur."
+
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Inscription distante"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
+msgstr ""
+
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Erreur lors de l'enregistrement de l'utilisateur."
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "La mise à jour de l'avatar a échoué."
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr ""
+
+#: lib/action.php:130
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "À propos"
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "Changer votre mot de passe"
+
+#: 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"
+msgstr ""
+
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Créer un nouveau compte"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "Il n'y a pas cet OpenID."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Aide"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "Nouveau message"
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "Nouveau message"
+
+#: lib/action.php:562
+msgid "Secondary site navigation"
+msgstr ""
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+msgid "All "
+msgstr ""
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+msgid "Block this user"
+msgstr ""
+
+#: lib/blockform.php:153
+msgid "Block"
+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 "Créer un nouveau compte"
+
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#, fuzzy
+msgid "Published"
+msgstr "Publié"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
+msgid "Favor this notice"
+msgstr "Mettre ce message dans vos favoris"
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Exporter les données"
+
+#: lib/galleryaction.php:121
+#, fuzzy
+msgid "Filter tags"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Fil des réponses à %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
+
+#: lib/galleryaction.php:137
+msgid "Tag"
+msgstr ""
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+msgid "URL of the homepage or blog of the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Description"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Description et intérêts (140 caractères maximum)"
+
+#: 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 (par exemple, ville, État, région, "
+"pays)"
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr "Groupe"
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr "Administrer"
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Déconnexion"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+msgstr "Ajouter et changer le logo de %s"
+
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
+msgstr "Groupes ayant le plus de membres"
+
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr "Groupes ayant le plus de messages"
+
+#: lib/grouptagcloudsection.php:56
+#, php-format
+msgid "Tags in %s group's notices"
+msgstr ""
+
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Page d'accueil non valide."
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Se connecter"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Quitter"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Nom d'utilisateur ou mot de passe invalide."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Créer un nouveau compte"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr "Se connecter ou s'enregistrer avec OpenID"
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s est occupé d'écouter vos notifications dans %2$s."
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Localisation"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Page d'accueil"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
+
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s est occupé d'écouter vos notifications dans %2$s."
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+#, fuzzy
+msgid "From"
+msgstr "de"
+
+# De #-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n
+# Nouveau message\n
+# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
+# à "Supprimer l'avis"
+#: lib/messageform.php:110
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Envoyer un message direct"
+
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "Nouveau message"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "Caractères restants"
+
+#: lib/noticelist.php:426
+msgid "in reply to"
+msgstr "En réponse à"
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Répondre à ce message"
+
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "Réponses"
+
+# De #-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n
+# Nouveau message\n
+# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
+# à "Supprimer l'avis"
+#: lib/noticelist.php:471 lib/noticelist.php:474
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Supprimer ce message"
+
+# De #-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n
+# Nouveau message\n
+# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
+# à "Supprimer l'avis"
+#: lib/noticelist.php:474
+#, fuzzy
+msgid "Delete"
+msgstr "Supprimer"
+
+#: 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/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr ""
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Public"
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
+msgstr "Mots-clés récents"
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Rechercher des personnes\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Messages"
+
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "Rechercher des groupes sur ce site"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr "Section sans titre"
+
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Inscription distante"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Inscription distante"
+
+#: lib/subgroupnav.php:97
+#, 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 "Inviter des amis et collègues à vous rejoindre sur %s"
+
+#: lib/subs.php:53
+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 "Suivre cet utilisateur"
+
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+msgstr "Aucun"
+
+#: lib/topposterssection.php:74
+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
+msgid "Unsubscribe from this user"
+msgstr "Ne plus suivre cet utilisateur"
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "Créer un nouveau compte"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Impossible de confirmer l'email"
+
+#~ msgid "Email address"
+#~ msgstr "Adresse email"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Erreur lors de l'insertion d'un message"
+
+#~ msgid ""
+#~ "It runs the [Laconica](http://laconi.ca/) microblogging software, version "
+#~ "%s, available under the [GNU Affero General Public License] (http://www."
+#~ "fsf.org/licensing/licenses/agpl-3.0.html)."
+#~ msgstr ""
+#~ "Il utilise le logiciel de microblog [Laconica](http://laconi.ca/), "
+#~ "version %s, disponible sous la licence [GNU Affero General Public "
+#~ "License] (http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+
+#, fuzzy
+#~ msgid "Unsupported type"
+#~ msgstr "Version OMB non-supportée"
+
+#, fuzzy
+#~ msgid "not a supported data format"
+#~ msgstr "Format de fichier d'image non-supporté."
diff --git a/locale/he_IL/LC_MESSAGES/laconica.mo b/locale/he_IL/LC_MESSAGES/laconica.mo
new file mode 100644
index 000000000..6114a35bb
--- /dev/null
+++ b/locale/he_IL/LC_MESSAGES/laconica.mo
diff --git a/locale/he_IL/LC_MESSAGES/laconica.po b/locale/he_IL/LC_MESSAGES/laconica.po
index b30da8437..ab63dc124 100644
--- a/locale/he_IL/LC_MESSAGES/laconica.po
+++ b/locale/he_IL/LC_MESSAGES/laconica.po
@@ -16,46 +16,84 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: 2008-09-17 23:59 GMT+3\n"
-"Last-Translator: Hezy Amiel <open@hezyamiel.com>\n"
-"Language-Team: Hebrew \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../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:193
-#: ../actions/register.php:191 actions/finishopenidlogin.php:88
-#: actions/register.php:205
+#: ../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, 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 ""
+
+#: ../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/subscribe.php:84
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s כעת מ�זין להודעות שלך ב-%2$s"
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -67,983 +105,1788 @@ msgid ""
 msgstr ""
 "%1$s מ�זין כעת להודעות שלך ב %2$s. \n"
 "\n"
-"\t%3$s\n שלך,\n %4$s.\n"
+"\t%3$s\n"
+" שלך,\n"
+" %4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../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 "הסטטוס של %1$s ב-%2$s "
 
-#: ../actions/publicrss.php:60
+#: ../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 ""
+
+#: ../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:70 ../lib/stream.php:45
+#: ../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 וחברי�"
 
-#: ../lib/util.php:233
+#: ../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
 #, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
-"**%%site.name%%** הו� שרות ביקרובלוג הניתן על ידי "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:235
+#: ../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%%** הו� שרות ביקרובלוג הניתן על ידי [%%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:250
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr "תנו קרדיט מל� לכותבי� בשמ� המל� �ו בכינויי�."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: 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/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
 msgstr "לפחות 6 �ותיות"
 
-#: ../actions/recoverpassword.php:165
+#: ../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/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"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 ""
-"קוד �ישור נשלח �ל כתובת המסרי� המידיי� "
-"שהוספת. עליך ל�שר �ת %s לשליחת מסרי� מידיי� �ליך."
 
-#: ../lib/util.php:296
+#: ../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/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 ""
+
+#: ../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 ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
 msgstr "�ודות"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "קבל"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "הוסף OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92
 msgid "Address"
 msgstr "כתבות"
 
-#: ../actions/showstream.php:254
+#: ../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:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
 #, php-format
 msgid "All updates for %s"
 msgstr "כל העדכוני� עבור %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../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:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "כבר מנוי!"
 
-#: ../actions/userauthorization.php:76
+#: ../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:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "בעתיד התחבר �וטומטית; ל� לשימוש במחשבי� ציבוריי�!"
 
-#: ../actions/avatar.php:32
+#: ../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/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "התמונה עודכנה."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"מחכה ל�ישור כתובת זו. בדוק �ת חשבון "
-"ה-Jabber/GTalk שלך לקבלת מסר ע� הור�ות נוספותץ (ה�� הוספת �ת %s לרשימת החברי� שלך?)"
+"מחכה ל�ישור כתובת זו. בדוק �ת חשבון ה-Jabber/GTalk שלך לקבלת מסר ע� הור�ות "
+"נוספותץ (ה�� הוספת �ת %s לרשימת החברי� שלך?)"
 
-#: ../lib/util.php:1136
+#: ../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
+#, fuzzy
 msgid "Before »"
 msgstr "לפני >>"
 
-#: ../actions/profilesettings.php:52
+#: ../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:93 ../actions/updateprofile.php:102
+#: ../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/updateprofile.php:118
+#: ../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:261
+#: ../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/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: 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:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "ל� ניתן להפעיל �ת �ובייקט הלקוח של OpenID."
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
 msgid "Cannot normalize that Jabber ID"
 msgstr "ל� ניתן לנרמל �ת זהות ה-Jabber הזה"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "שנה"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "שנה סיסמה"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../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:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "�שר כתובת"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "ה�ישור בוטל."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "קוד ה�ישור ל� נמצ�."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "התחבר"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "התחבר לחשבון קיי�"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "צור קשר"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "נכשלה יצירת OpenID מתוך: %s"
 
-#: ../lib/openid.php:160
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow 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:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166
 msgid "Could not save avatar info"
 msgstr "שמירת מידע התמונה נכשל"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159
 msgid "Could not save new profile info"
 msgstr "שמירת מידע הפרופיל החדש נכשלה"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-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/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "יצירת המנוי נכשלה."
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
 #: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
 #: actions/confirmaddress.php:84 actions/emailsettings.php:252
 #: actions/imsettings.php:226 actions/smssettings.php:249
+#: actions/confirmaddress.php:126 actions/emailsettings.php:375
+#: actions/imsettings.php:357 actions/smssettings.php:370
 msgid "Couldn't delete email confirmation."
-msgstr "מחיקת �ישור הדו�"ל נכשלה."
+msgstr ""
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
 msgstr "מחיקת המנוי ל� הצליחה."
 
-#: ../actions/remotesubscribe.php:125
+#: ../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."
 msgstr "�סימון הבקשה ל� התקבל."
 
-#: ../actions/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: 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:175
+#: ../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/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "צור"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "צור חשבון חדש"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../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:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "כתובת מ�ושרת נוכחית של Jabber/GTalk."
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../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 "כרגע"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %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/profilesettings.php:54
+#: ../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:181 ../actions/register.php:158
-#: ../actions/register.php:161 ../lib/settingsaction.php:87
-#: actions/register.php:172 actions/register.php:175 lib/settingsaction.php:87
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
-msgstr "דו�"ל"
+msgstr ""
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "כתובת דו�"ל"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
+msgid "Email Address"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
-#: ../actions/register.php:73 actions/register.php:80
+#: ../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 "כתובת דו�"ל זו כבר קיימת."
+msgstr ""
 
-#: ../lib/mail.php:82 ../lib/mail.php:90 lib/mail.php:90
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
-msgstr "�ישור כתובת הדו�"ל"
+msgstr ""
 
-#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
-#: actions/recoverpassword.php:197
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../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 "הכנס כינוי �ו כתובת דו�"ל."
+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:136
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
+#: actions/userauthorization.php:161
 msgid "Error authorizing token"
 msgstr "שגי�ה ב�ישור ה�סימון"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../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: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/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "שגי�ה בהכנסת ההוד�ה"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
 msgid "Error inserting remote profile"
 msgstr "שגי�ה בהכנסת פרופיל מרוחק"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
 msgstr "שגי�ה בשמירת �ישור הכתובת."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
 msgid "Error saving remote profile"
 msgstr "שגי�ה בשמירת פרופיל מרוחק"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../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:237 lib/openid.php:246
 msgid "Error saving the user."
 msgstr "שגי�ה בשמירת המשתמש."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164
 msgid "Error saving user; invalid."
 msgstr "שגי�ה בשמירת ש� המשתמש, ל� עומד בכללי�."
 
-#: ../actions/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 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: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:79
+#: ../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:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "כינוי זה כבר קיי�"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "רשימת ש�לות נפוצות"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "עדכון התמונה נכשל."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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:61 ../actions/repliesrss.php:80
+#: ../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/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, 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
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr "לצרכי �בטחה, הכנס מחדש �ת ש� המשתמש והסיסמה לפני שתשנה �ת ההגדרות."
 
-#: ../actions/profilesettings.php:44
+#: ../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:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "עזרה"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "בית"
 
-#: ../actions/profilesettings.php:49
+#: ../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:87
+#: ../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/imsettings.php:61
+#: ../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:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "הגדרות מסרי� מידיי�"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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 שלך."
+"�� יש לך כבר חשבון, התחבר ע� ש� המשתמש והסיסמה שלך וקשר �ותו �ל ה-OpenID שלך."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"�� �תה רוצה להוסיף OpenID לחשבון שלך, הכנס "
-"�ותו לתיבה שלמטה ולחץ \"הוסף\""
+"�� �תה רוצה להוסיף OpenID לחשבון שלך, הכנס �ותו לתיבה שלמטה ולחץ \"הוסף\""
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"�� שכחת �ו �יבדת �ת סיסמתך, תוכל לקבל חדשה "
-"שתישלח �ליך לכתובת הדו�"ל הרשומה בחשבונך."
 
-#: ../actions/password.php:69
+#: ../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 "הסיסמה הישנה ל� נכונה"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
 msgid "Incorrect username or password."
 msgstr "ש� משתמש �ו סיסמה ל� נכוני�."
 
-#: ../actions/recoverpassword.php:226 ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
-msgstr "הור�ות לשיחזור הסיסמה שלך נשלחו לכתובת הדו�"ל הרשומה בחשבונך."
+msgstr ""
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "כתובת התמונה '%s' �ינה חוקית"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "כתובת �תר הבית '%s' �ינה חוקית"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "כתובת הרשיון '%s' �יה חוקית"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
 msgid "Invalid notice content"
 msgstr "תוכן ההודעה ל� חוקי"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72
 msgid "Invalid notice uri"
 msgstr "כתובת ל� חוקית"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "כתובת ל� חוקית"
 
-#: ../actions/updateprofile.php:86
+#: ../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: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."
 msgstr "השרת החזיר כתובת פרופיל ל� חוקית"
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "גודל ל� חוקי."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
 msgid "Invalid username or password."
 msgstr "ש� המשתמש �ו הסיסמה ל� חוקיי�"
 
-#: ../lib/util.php:237
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"הו� פועל על תוכנת המיקרובלוג "
-"[](http://laconi.caל�קוניקה/) ל�קוניקה, גירסה %s, "
-"המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
+"הו� פועל על תוכנת המיקרובלוג [](http://laconi.caל�קוניקה/) ל�קוניקה, גירסה %"
+"s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)"
 
-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: actions/imsettings.php:296
 msgid "Jabber ID already belongs to another user."
 msgstr "זיהוי ה-Jabber כבר שייך למשתמש �חר."
 
-#: ../actions/imsettings.php:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
-"כתובת Jabber �ו GTalk, כגון \"UserName@example.org\". הוסף "
-"�ת %s �ל רשימת החברי� בתוכנת ההמסרי� המידיי� �ו GTalk שלך."
+"כתובת Jabber �ו GTalk, כגון \"UserName@example.org\". הוסף �ת %s �ל רשימת "
+"החברי� בתוכנת ההמסרי� המידיי� �ו GTalk שלך."
 
-#: ../actions/profilesettings.php:55
+#: ../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 ""
+
+#: ../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:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "התחבר לחשבון [OpenID](%%doc.openid%%). "
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"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%%) לחשבון "
+"היכנס בעזרת ש� המשתמש והסיסמה שלך. עדיין �ין לך ש� משתמש? [הרש�](%%action."
+"register%%) לחשבון "
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "צ�"
 
-#: ../actions/login.php:106
+#: ../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 "שכחת �ו �יבדת �ת הסיסמה?"
 
-#: ../actions/showstream.php:281
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php: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 "חבר מ�ז"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "מיקרובלוג מ�ת %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/finishopenidlogin.php:107 actions/register.php:429
 msgid "My text and files are available under "
 msgstr "הטקסטי� והקבצי� שלי מופצי� תחת רשיון"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../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 ""
+
+#: ../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:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "הודעה חדשה"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "הסיסמה החדשה נשמרה בהצלחה. �תה מחובר למערכת."
 
-#: ../actions/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../actions/login.php:101 ../actions/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:99
-#: ../actions/register.php:59
+#: ../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:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
 msgstr "כינוי זה �סור."
 
-#: ../actions/remotesubscribe.php:72
+#: ../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:147 ../actions/recoverpassword.php:162
-#: actions/recoverpassword.php:167
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
-msgstr "כינוי �ו דו�"ל"
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
+msgid "No"
+msgstr "ל�"
 
-#: ../actions/imsettings.php:147
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
+#: actions/imsettings.php:279
 msgid "No Jabber ID."
 msgstr "�ין זיהוי Jabber כזה."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "ל� התבקש �ישור!"
 
-#: ../actions/confirmaddress.php:33
+#: ../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:49
+#: ../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/userbyid.php:27
+#: ../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 "�ין זיהוי."
 
+#: ../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:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
 msgstr "�ין כינוי"
 
-#: ../actions/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: 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 "השרת ל� החזיר כתובת פרופיל"
 
-#: ../actions/recoverpassword.php:189 ../actions/recoverpassword.php:226
-#: actions/recoverpassword.php:232
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+#: actions/recoverpassword.php:266
 msgid "No registered email address for that user."
-msgstr "�ין דו�"ל רשו� עבור משתמש זה."
+msgstr ""
 
-#: ../actions/userauthorization.php:48
+#: ../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:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "�ין גודל."
 
-#: ../actions/openidsettings.php:135
+#: ../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/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+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 "�ין OpenID כזה."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "�ין מסמך כזה."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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:56
+#: actions/recoverpassword.php:62
 msgid "No such recovery code."
 msgstr "�ין קוד שיחזור כזה."
 
-#: ../actions/postnotice.php:56
+#: ../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:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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 "�ין משתמש כזה."
 
-#: ../lib/gallery.php:76
+#: ../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:60
+#: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr "זהו ל� קוד �ישור."
 
-#: ../actions/imsettings.php:158
+#: ../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"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "ל� עומד בכללי� ל-OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
-#: ../actions/register.php:63 actions/register.php:70
+#: ../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 "כתובת דו�"ל ל� חוקית."
+msgstr ""
 
-#: ../actions/profilesettings.php:83 ../actions/register.php:61
+#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
+#: 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:118
+#: ../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/remotesubscribe.php:111
+#: ../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/remotesubscribe.php:104
+#: ../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/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
 msgstr "זהו ל� קובץ תמונה, �ו שחל בו שיבוש."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "ל� מורשה."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "זו תגובה ל� צפויה!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/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/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "ל� מנוי!"
 
-#: ../actions/showstream.php:82
+#: ../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:39
+#: actions/shownotice.php:94
 msgid "Notice has no profile"
 msgstr "להודעה �ין פרופיל"
 
-#: ../actions/showstream.php:297
+#: ../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/password.php:39
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "סיסמה ישנה"
 
-#: ../lib/util.php:288
+#: ../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: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:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
 msgstr "הגשה �וטומטית של OpenID"
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: 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:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "כשל OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "הגדרות OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "העל�ה חלקית."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:335
 msgid "Password and confirmation do not match."
 msgstr "הסיסמה ו�ישורה �ינן תו�מות."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+#: actions/recoverpassword.php:331
 msgid "Password must be 6 chars or more."
 msgstr "הסיסמה חייבת להיות בת לפחות 6 �ותיות."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
 msgid "Password recovery requested"
 msgstr "התבקש שיחזור סיסמה"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../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/password.php:61 ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../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"
+msgstr "חיפוש �נשי�"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "חיפוש סיסמה"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "�ישי"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/userauthorization.php:78
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"בדוק �ת הפרטי� כדי לווד� שברצונך להירש� "
-"כמנוי להודעות משתמש זה. �� �ינך רוצה להירש�, לחץ \"בטל\"."
+"בדוק �ת הפרטי� כדי לווד� שברצונך להירש� כמנוי להודעות משתמש זה. �� �ינך רוצה "
+"להירש�, לחץ \"בטל\"."
 
-#: ../actions/imsettings.php:74
+#: ../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/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "העדפות"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "העדפות נשמרו."
 
-#: ../lib/util.php:300
+#: ../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 "פרטיות"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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/stream.php:54
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "כתובת הפרופיל"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
 msgstr "הגדרות הפרופיל"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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 "פרופיל ל� מוכר"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "ציבורי"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "הזנת זר� הציבורי"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "קו זמן ציבורי"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr "שיחזור"
 
-#: ../actions/recoverpassword.php:141
+#: ../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:67
+#: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr "קוד שיחזור למשתמש ל� ידוע."
 
-#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: actions/register.php:69 actions/register.php:436 lib/action.php:338
+#: lib/facebookaction.php:277 lib/logingroupnav.php:78
 msgid "Register"
 msgstr "הירש�"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "דחה"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414
 msgid "Remember me"
 msgstr "זכור �ותי"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
 msgstr "�ין פרופיל תו�� לפרופיל המרוחק "
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "הרשמה מרוחקת"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "הסר OpenID"
 
@@ -1052,50 +1895,92 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"הסרת ה-OpenID היחיד שלך תגרו� לכך של� תוכל "
-"להתחבר למערכת. �� �תה צריך להסיר �ותו, לפני כן הוסף OpenID �חר."
+"הסרת ה-OpenID היחיד שלך תגרו� לכך של� תוכל להתחבר למערכת. �� �תה צריך להסיר "
+"�ותו, לפני כן הוסף OpenID �חר."
 
-#: ../lib/stream.php:49
+#: ../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:50
+#: ../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:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "�יפוס"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "�יפוס סיסמה"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr "סמס"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
 msgid "Same as password above"
 msgstr "זהה לסיסמה למעלה"
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../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:73 ../lib/util.php:277
+#: ../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:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "הזנת זר� החיפושי�"
 
-#: ../actions/noticesearch.php:30
+#: ../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 �ותיות."
+"חפש הודעות ב-%%site.name%% לפי תוכנן. הפרד בעזרת רווחי� בין הביטויי�; עליה� "
+"להיות בני לפחות 3 �ותיות."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1103,153 +1988,285 @@ msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"חפש �נשי� ב-%%site.name%% לפי ש�, מיקו�, �ו תחומי "
-"עניין. הפרד בעזרת רווחי� בין הביטויי�; עליה� להיות בני לפחות 3 �ותיות."
+"חפש �נשי� ב-%%site.name%% לפי ש�, מיקו�, �ו תחומי עניין. הפרד בעזרת רווחי� "
+"בין הביטויי�; עליה� להיות בני לפחות 3 �ותיות."
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: actions/smssettings.php:457
+msgid "Select a carrier"
+msgstr ""
 
-#: ../lib/util.php:982
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
+#: lib/messageform.php:167 lib/noticeform.php:177
 msgid "Send"
 msgstr "שלח"
 
-#: ../actions/imsettings.php:71
+#: ../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."
 
-#: ../lib/util.php:282
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr "הגדרות"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "ההגדרות נשמרו."
 
-#: ../actions/finishaddopenid.php:66
+#: ../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 "קרה משהו מוזר."
 
-#: ../lib/util.php:302
+#: ../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:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "סטטיסטיקה"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../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:172
-#: ../actions/showstream.php:181
+#: ../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:294 ../actions/subscribers.php:27
+#: ../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:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "ההרשמה �ושרה"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "ההרשמה נדחתה"
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/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/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
 msgid "System error uploading file."
 msgstr "שגי�ת מערכת בהעל�ת הקובץ."
 
-#: ../actions/noticesearch.php:34
+#: ../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: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:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "כתובת זו כבר �ושרה."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
 msgstr "קוד ה�ישור הזה �ינו מיועד לך!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "קובץ זה גדול מידי."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr "זהו כבר זיהוי ה-Jabber שלך."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr "זהו ל� זיהוי ה-Jabber שלך."
 
-#: ../actions/imsettings.php:201
+#: ../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 "זוהי כתובת מסרי� מידיי� שגויה."
 
-#: ../actions/newnotice.php:52
+#: ../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/confirmaddress.php:86
+#: ../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/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "הכתובת \"%s\" �ושרה עבור חשבונך."
 
-#: ../actions/imsettings.php:241
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413
 msgid "The address was removed."
 msgstr "הכתובת הוסרה."
 
-#: ../actions/userauthorization.php:311
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"המנוי �ושר, �בל ל� התקבלה כתובת �ליה ניתן "
-"לחזור. בדוק �ת הור�ות ה�תר וחפש כיצד ל�שר מנוי. �סימון המנוי שלך הו�:"
+"המנוי �ושר, �בל ל� התקבלה כתובת �ליה ניתן לחזור. בדוק �ת הור�ות ה�תר וחפש "
+"כיצד ל�שר מנוי. �סימון המנוי שלך הו�:"
 
-#: ../actions/userauthorization.php:321
+#: ../actions/userauthorization.php:322
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"המנוי נדחה, �בל ל� התקבלה כתובת לחזרה. "
-"בדוק �ת הור�ות ה�תר וחפש כיצד להשלי� דחיית מנוי."
+"המנוי נדחה, �בל ל� התקבלה כתובת לחזרה. בדוק �ת הור�ות ה�תר וחפש כיצד להשלי� "
+"דחיית מנוי."
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 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 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "�לה ה�נשי� המ�זיני� להודעות שלך."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "�לה ה�נשי� ש%s מ�זין להודעות שלה�."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "�לה ה�נשי� שלהודעות שלה� �תה מ�זין."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/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/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
 msgstr "קוד �ישור זה ישן מידי. �נ� התחל מחדש."
 
@@ -1259,77 +2276,151 @@ msgid ""
 "button to go to your OpenID provider."
 msgstr "טופס �מור לשלוח �ת עצמו �וטומטית. �� ל�, "
 
-#: ../actions/finishopenidlogin.php:56
+#: ../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. �תה יכול ליצור חשבון חדש, �ו להתחבר לחשבון קיי�, �� יש לך."
+"זו ההתחברות הר�שונה שלך �ל %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:147
+#: ../lib/util.php:164 lib/util.php:246
 msgid "This page is not available in a media type you accept"
 msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
 
+#: ../actions/profilesettings.php:63 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/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
-"כדי לעשות מנוי, עליך [להיכנס "
-"למערכת](%%action.login%%), �ו [להירש�](%%action.register%%) "
-"לחשבון חדשה. �� יש לך כבר חשבון [במערכת "
-"מיקרובלוג תו�מת](%%doc.openmublog%%), הכנס �ת כתובת הפרופיל שלך למטה. "
+"כדי לעשות מנוי, עליך [להיכנס למערכת](%%action.login%%), �ו [להירש�](%%action."
+"register%%) לחשבון חדשה. �� יש לך כבר חשבון [במערכת מיקרובלוג תו�מת](%%doc."
+"openmublog%%), הכנס �ת כתובת הפרופיל שלך למטה. "
 
-#: ../actions/profilesettings.php:51
+#: ../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:74 actions/remotesubscribe.php:83
+#: actions/remotesubscribe.php:110
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תו�� �חר"
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/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:237
+#: ../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:245
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr "�� ל� פורט �חרת, כל הזכויות על התוכן של �תר "
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "סוג ל� מזוהה של כתובת %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "בטל מנוי"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../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/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr "פורמט התמונה �ינו נתמך."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "ההעלה"
 
@@ -1340,107 +2431,209 @@ msgid ""
 "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."
+msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "לשימוש רק במקרי� של עידכוני�, הודעות מערכת, ושיחזורי סיסמ�ות"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
 msgid "User being listened to doesn't exist."
 msgstr "המשתמש �ליו �תה מ�זין �ינו קיי�."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../actions/foaf.php:47 ../actions/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/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "כינוי משתמש"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
 msgstr "מה המצב %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../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/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "סוג התמונה של '%s' �ינו מת�י�"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "גודל התמונה של: '%s' ל� מת�י�."
 
-#: ../actions/finishaddopenid.php:64
+#: ../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/recoverpassword.php:31
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "�פשר לשנות �ת הסיסמה כ�ן. בחר סיסמה טובה!"
 
-#: ../actions/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "ניתן ליצור חשבון חדש ולהתחיל לפרס� הודעות."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr "הסיר OpenID מחשבונך על ידי לחיצה על הכפתור המסומן \"הסר\"."
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"�פשר לשלוח ולקבל בודעות דרך Jabber/GTalk [instant "
-"messages](%%doc.im%%) הגדר �ת כתובתך והעדפותיך למטה."
+"�פשר לשלוח ולקבל בודעות דרך Jabber/GTalk [instant messages](%%doc.im%%) הגדר "
+"�ת כתובתך והעדפותיך למטה."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"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:51
+#: ../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:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67
 msgid "You did not send us that profile"
 msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
 
-#: ../actions/recoverpassword.php:134
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "כתובת ה-OpenID שלך"
 
-#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
-msgstr "כינויך על שרת זה, �ו כתובת הדו�"ל הרשומה שלך."
+msgstr ""
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -1448,1372 +2641,2192 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"מ�פשר לך להיכנס להרבה �תרי� בעזרת חשבון "
-"משתמש �חד. נהל �ת שיוך ה-OpenID מכ�ן. [OpenID](%%doc.openid%%)"
+"מ�פשר לך להיכנס להרבה �תרי� בעזרת חשבון משתמש �חד. נהל �ת שיוך ה-OpenID "
+"מכ�ן. [OpenID](%%doc.openid%%)"
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "לפני מספר שניות"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "לפני כ-%d ימי�"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "לפני כ-%d שעות"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr "לפני כ-%d דקות"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr "לפני כ-%d חודשי�"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "לפני כיו�"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "לפני כדקה"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "לפני כחודש"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "לפני כשנה"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "לפני כשעה"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "הגב"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "זהה לסיסמה למעלה"
 
-#: ../lib/util.php:1127
+#: ../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 "<< �חרי"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
+#: 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/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: 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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
+msgid "%s favorite notices"
 msgstr ""
 
-#: ../actions/invite.php:168 actions/invite.php:176
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
+msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+#: 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:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
+#: actions/login.php:122 actions/login.php:264
+msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
+#: actions/login.php:126 actions/login.php:268
+msgid "Login with your username and password. "
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
+#: 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/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
+#: 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/register.php:213
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+msgid "No such user"
 msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
+#: 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/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/openidsettings.php:28 actions/openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 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/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
+#: actions/outbox.php:53 actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#, php-format
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+"Search for people on %%site.name%% by their name, location, or interests. "
 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/profilesettings.php:27 actions/profilesettings.php:69
+msgid "You can update your personal profile info here "
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
+#: 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 ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+msgid "This confirmation code is too old. "
 msgstr ""
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
 msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
 msgstr ""
 
-#: ../actions/register.php:202
+#: actions/register.php:95 actions/register.php:180
+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...\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."
+"want to..."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
+#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
+#: 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:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/showstream.php:154
+msgid "Send a message"
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, php-format
+msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "Direct messages to %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#, php-format
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
+msgid "No message text!"
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
+#: 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/tag.php:55 actions/tag.php:55
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#, php-format
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
+#: 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 ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
+#: 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 ""
 
-#: ../actions/recoverpassword.php:137
+#: actions/twittersettings.php:27
 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."
+"Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+msgid "Twitter settings"
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+msgid "Current verified Twitter account."
 msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr "שפה"
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
 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/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/twittersettings.php:137
 #, php-format
-msgid "Manage how you get email from %%site.name%%."
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
 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/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
+msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr "חדש"
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+msgid "Twitter settings saved."
+msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
+msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr "ל�"
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
+msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
+#: 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/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+msgid "Twitter preferences saved."
 msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "
 msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
+msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
+msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+msgid "Command results"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
 msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
 msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
+#: classes/Command.php:96 classes/Command.php:113
+#, php-format
+msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
+msgid "User has no last notice"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr "ל� נמצ�"
+#: classes/Command.php:146 classes/Command.php:166
+msgid "Notice marked as fave."
+msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
+#: classes/Command.php:169 classes/Command.php:192
 #, php-format
-msgid "Notices tagged with %s"
+msgid "Fullname: %s"
 msgstr ""
 
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr "�נשי�"
+#: classes/Command.php:175 classes/Command.php:198
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr "חיפוש �נשי�"
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
+msgstr "�ודות: %s"
 
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
 msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
+#: classes/Command.php:295 classes/Command.php:335
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
+#: classes/Command.php:376
+msgid "Command not yet implemented."
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr "סמס"
+#: classes/Command.php:313 classes/Command.php:356
+msgid "Notification off."
+msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
 msgstr ""
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
+#: classes/Message.php:53 classes/Message.php:56
+msgid "Could not insert message."
 msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
+#: classes/Message.php:63 classes/Message.php:66
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: lib/mail.php:253 lib/mail.php:512
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
+#: lib/mailbox.php:43 lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
+#: lib/openid.php:195 lib/openid.php:203
+msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+msgid "Favorites"
+msgstr "מועדפי�"
+
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "טקסט"
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
+msgstr "מתשמש"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
 msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
 msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
+msgid "Twitter"
 msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
+msgid "Twitter integration options"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
+#: 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 ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
+#: 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."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "הגדרות"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "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 ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
 msgstr ""
 
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
+#: 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"
 msgstr ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "�ין משתמש כזה."
+
+#: actions/block.php:129
+msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/block.php:162
+#, fuzzy
+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 ""
+
+#: actions/disfavor.php:94
+#, fuzzy
+msgid "Add to favorites"
+msgstr "מועדפי�"
+
+#: actions/editgroup.php:54
 #, php-format
-msgid "Updates from %1$s on %2$s!"
+msgid "Edit %s group"
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: 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/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: 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"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-msgstr "כן"
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
+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/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "הביוגרפיה �רוכה מידי (לכל היותר 140 �ותיות)"
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "עידכון המשתמש נכשל."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "ההגדרות נשמרו."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "שגי�ה ב�ישור הקוד."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: 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!"
+msgstr ""
+
+#: actions/facebookhome.php:196
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "If you would like the %s app to automatically update "
 msgstr ""
 
-#: ../lib/mail.php:147
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, 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 "Allow %s to update my Facebook status"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: 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"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
+#: 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/facebookinvite.php:70
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "מחק"
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
+#: 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:"
 msgstr ""
 
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
 msgstr ""
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
+#: 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!"
 msgstr ""
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "העדפות נשמרו."
+
+#: actions/facebooksettings.php:90
+msgid "Automatically update my Facebook status with my notices."
 msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Favor"
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "פרופיל"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
 msgstr ""
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "העדפות"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
+#: 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."
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/featured.php:71
 #, php-format
-msgid "%s favorite notices"
+msgid "Featured users, page %d"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/featured.php:99
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/inbox.php:28
-#, php-format
-msgid "Inbox for %s - page %d"
+#: actions/finishremotesubscribe.php:188
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/inbox.php:30
-#, php-format
-msgid "Inbox for %s"
+#: actions/groupbyid.php:79
+msgid "No ID"
 msgstr ""
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+msgid "Group logo"
 msgstr ""
 
-#: actions/invite.php:178
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "התמונה עודכנה."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "עדכון התמונה נכשל."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: actions/login.php:126
-msgid "Login with your username and password. "
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
 msgstr ""
 
-#: actions/newmessage.php:65
-msgid "No recipient specified."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
+#: actions/groups.php:90
+#, php-format
+msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: 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 ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
+"חפש �נשי� ב-%%site.name%% לפי ש�, מיקו�, �ו תחומי עניין. הפרד בעזרת רווחי� "
+"בין הביטויי�; עליה� להיות בני לפחות 3 �ותיות."
 
-#: actions/newmessage.php:108
-msgid "No such user"
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "חיפוש סיסמה"
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
 msgstr ""
 
-#: actions/newmessage.php:117
-msgid "New message"
-msgstr "הודעה חדשה"
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
 
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
+#: actions/imsettings.php:147
+#, fuzzy
+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/openidsettings.php:28
+#: actions/joingroup.php:95
+#, 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"
+
+#: actions/joingroup.php:135
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgid "%s joined group %s"
 msgstr ""
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/leavegroup.php:65
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "�ין הודעה כזו."
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+
+#: actions/leavegroup.php:100
+msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/outbox.php:28
-#, php-format
-msgid "Outbox for %s - page %d"
+#: actions/leavegroup.php:130
+msgid "Could not find membership record."
 msgstr ""
 
-#: actions/outbox.php:30
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "נכשלה יצירת OpenID מתוך: %s"
+
+#: actions/leavegroup.php:145
 #, php-format
-msgid "Outbox for %s"
+msgid "%s left group %s"
 msgstr ""
 
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
 msgstr ""
 
-#: actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
+#: actions/newgroup.php:177
+#, fuzzy
+msgid "Could not create group."
+msgstr "שמירת מידע התמונה נכשל"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "יצירת המנוי נכשלה."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "קובץ זה גדול מידי."
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "הודעות"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
 msgstr ""
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
+#: actions/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "כניסת OpenId"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "הסר OpenID"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "הגדרות"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
 msgstr ""
 
-#: actions/register.php:216
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "חיפוש"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "ש� המיקו� �רוך מידי (מותר עד 255 �ותיות)."
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "שנה סיסמה"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "הסיסמה נשמרה."
+
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "ל� עומד בכללי� ל-OpenID."
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:91
 #, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "פרופיל ל� מוכר"
+
+#: actions/profilesettings.php:124
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/profilesettings.php:144
+msgid "Automatically subscribe to whoever "
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: 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."
+msgstr ""
+
+#: actions/public.php:220
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
 
-#: actions/showfavorites.php:61
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "הזנת זר� הציבורי"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Feed for favorites of %s"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/showmessage.php:33
-msgid "No such message."
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: 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 ""
 
-#: actions/showmessage.php:61
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: 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 "הכתובת של �תר הבית שלך, בלוג, �ו פרופיל ב�תר �חר "
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "מיקומך, למשל \"עיר, מדינה �ו מחוז, �רץ\""
+
+#: actions/register.php:432
+msgid " except this private data: password, "
 msgstr ""
 
-#: actions/showmessage.php:66
+#: actions/register.php:471
 #, php-format
-msgid "Message from %1$s on %2$s"
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: 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/smssettings.php:312
+#: actions/replies.php:118
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "תגובת עבור %s"
+
+#: actions/showfavorites.php:79
 #, php-format
-msgid "Mobile carrier for your phone. "
+msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
-msgid "Direct messages to %s"
+msgid "%s group"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/showgroup.php:79
 #, php-format
-msgid "All the direct messages sent to %s"
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
+#: 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"
+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"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, 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 ""
+
+#: actions/showgroup.php:370
+msgid "All members"
+msgstr ""
+
+#: actions/showgroup.php:378
 #, php-format
-msgid "All the direct messages sent from %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: 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"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+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"
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/showstream.php:542
 #, php-format
-msgid "%s / Favorites from %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: 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"
+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 "מנויי�"
+
+#: actions/subscribers.php:52
 #, php-format
-msgid "%s updates favorited by %s / %s."
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: 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
+#, 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."
+
+#: actions/subscriptions.php:122
+#, fuzzy
+msgid "Jabber"
+msgstr "�ין זיהוי Jabber כזה."
+
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "מיקרובלוג מ�ת %s"
+
+#: actions/tag.php:66
 #, php-format
-msgid "%s added your notice as a favorite"
+msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: 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 "Tag %s"
+msgstr ""
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr ""
+
+#: actions/tagother.php:149
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/tagother.php:164
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/tagother.php:191
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
+#: 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."
 msgstr ""
 
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
+#: 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."
 msgstr ""
 
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "ל� נמצ�"
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "סיסמה חדשה"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
 msgstr ""
 
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
 msgstr ""
 
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
+#: actions/twittersettings.php:341
+#, php-format
+msgid "Unable to retrieve account information "
 msgstr ""
 
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "שגי�ה בשמירת המשתמש."
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "השרת ל� החזיר כתובת פרופיל"
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "�ין פרופיל תו�� לפרופיל המרוחק "
+
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "בטל מנוי"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
+msgstr ""
+
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "בעיה בשמירת ההודעה."
+
+#: classes/Notice.php:109
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+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 "Unable to retrieve account information for \"%s\" from Twitter."
+msgid "%s - %s"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
+#: lib/action.php:145
+msgid "Untitled page"
 msgstr ""
 
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
+#: lib/action.php:316
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
+#: lib/action.php:325
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "�ודות"
+
+#: lib/action.php:328
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
+#: lib/action.php:332
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
+#: lib/action.php:335
+msgid "Login to the site"
 msgstr ""
 
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "צור חשבון חדש"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "�ין OpenID כזה."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "עזרה"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "הודעה חדשה"
+
+#: lib/action.php:417
+msgid "Local views"
 msgstr ""
 
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "הודעה חדשה"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "הרשמות"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
 msgstr ""
 
-#: classes/Channel.php:113
-msgid "Command results"
+#: lib/action.php:630
+msgid "All "
 msgstr ""
 
-#: classes/Channel.php:148
-msgid "Command complete"
+#: lib/action.php:635
+msgid "license."
 msgstr ""
 
-#: classes/Channel.php:158
-msgid "Command failed"
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "�ין משתמש כזה."
+
+#: lib/blockform.php:153
+msgid "Block"
 msgstr ""
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
 msgstr ""
 
-#: classes/Command.php:96
+#: lib/facebookaction.php:268
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
+#: 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/feedlist.php:64
+msgid "Export data"
 msgstr ""
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
+#: lib/galleryaction.php:121
+msgid "Filter tags"
 msgstr ""
 
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
+#: lib/galleryaction.php:131
+msgid "All"
 msgstr ""
 
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
+#: lib/galleryaction.php:137
+msgid "Tag"
 msgstr ""
 
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
+#: lib/galleryaction.php:139
+msgid "Go"
 msgstr ""
 
-#: classes/Command.php:178
-#, php-format
-msgid "About: %s"
-msgstr "�ודות: %s"
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "הכתובת של �תר הבית שלך, בלוג, �ו פרופיל ב�תר �חר "
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "הרשמות"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
+
+#: lib/groupeditform.php:158
+#, 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"
+msgstr ""
 
-#: classes/Command.php:200
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Edit %s group properties"
 msgstr ""
 
-#: classes/Command.php:214
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "צ�"
+
+#: lib/groupnav.php:107
 #, php-format
-msgid "Direct message to %s sent"
+msgid "Add or edit %s logo"
 msgstr ""
 
-#: classes/Command.php:216
-msgid "Error sending direct message."
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
 msgstr ""
 
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
 msgstr ""
 
-#: classes/Command.php:270
+#: lib/grouptagcloudsection.php:56
 #, php-format
-msgid "Subscribed to %s"
+msgid "Tags in %s group's notices"
 msgstr ""
 
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "היכנס"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "שמור"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "ש� המשתמש �ו הסיסמה ל� חוקיי�"
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "צור חשבון חדש"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
 msgstr ""
 
-#: classes/Command.php:295
+#: lib/mail.php:175
 #, php-format
-msgid "Unsubscribed from %s"
+msgid ""
+"Hey, %s.\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
-msgstr ""
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s כעת מ�זין להודעות שלך ב-%2$s"
 
-#: classes/Command.php:313
-msgid "Notification off."
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "מיקו�"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "�תר בית"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:315
-msgid "Can't turn off notification."
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
 msgstr ""
 
-#: classes/Command.php:333
-msgid "Notification on."
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr ""
 
-#: classes/Command.php:335
-msgid "Can't turn on notification."
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s כעת מ�זין להודעות שלך ב-%2$s"
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
 msgstr ""
 
-#: classes/Command.php:344
-msgid "Commands:\n"
+#: lib/messageform.php:110
+msgid "Send a direct notice"
 msgstr ""
 
-#: classes/Message.php:53
-msgid "Could not insert message."
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "הודעה חדשה"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "לפחות 6 �ותיות"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "בתגובה ל..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
 msgstr ""
 
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "הגב"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+msgid "Delete this notice"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: lib/noticelist.php:474
+#, fuzzy
+msgid "Delete"
+msgstr "מחק"
+
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
 msgstr ""
 
-#: lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: lib/nudgeform.php:128
+msgid "Nudge"
 msgstr ""
 
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/personaltagcloudsection.php:56
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
+#: lib/profilelist.php:182
+msgid "(none)"
 msgstr ""
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "ציבורי"
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
 msgstr ""
 
-#: lib/personal.php:65
-msgid "Favorites"
-msgstr "מועדפי�"
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
+msgstr ""
 
-#: lib/personal.php:66
-#, php-format
-msgid "%s's favorite notices"
+#: lib/publicgroupnav.php:86
+msgid "Featured"
 msgstr ""
 
-#: lib/personal.php:66
-msgid "User"
-msgstr "מתשמש"
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "�נשי�"
 
-#: lib/personal.php:75
-msgid "Inbox"
-msgstr ""
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "הודעות"
 
-#: lib/personal.php:76
-msgid "Your incoming messages"
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
 msgstr ""
 
-#: lib/personal.php:80
-msgid "Outbox"
+#: lib/section.php:89
+msgid "Untitled section"
 msgstr ""
 
-#: lib/personal.php:81
-msgid "Your sent messages"
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "הרשמה מרוחקת"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "הרשמה מרוחקת"
+
+#: lib/subgroupnav.php:97
+#, php-format
+msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/settingsaction.php:99
-msgid "Twitter"
+#: lib/subgroupnav.php:104
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "למשתמש �ין פרופיל."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "ההרשמה �ושרה"
+
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+msgstr "ל�"
+
+#: lib/topposterssection.php:74
+msgid "Top posters"
 msgstr ""
 
-#: lib/util.php:1718
-msgid "To"
-msgstr "�ל"
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "�ין משתמש כזה."
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
+#: 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 "צור חשבון חדש"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "שגי�ה בהכנסת ההוד�ה"
diff --git a/locale/it_IT/LC_MESSAGES/laconica.mo b/locale/it_IT/LC_MESSAGES/laconica.mo
index e32264533..6fe09461f 100644
--- a/locale/it_IT/LC_MESSAGES/laconica.mo
+++ b/locale/it_IT/LC_MESSAGES/laconica.mo
diff --git a/locale/it_IT/LC_MESSAGES/laconica.po b/locale/it_IT/LC_MESSAGES/laconica.po
index 83d13b13e..aafb45767 100644
--- a/locale/it_IT/LC_MESSAGES/laconica.po
+++ b/locale/it_IT/LC_MESSAGES/laconica.po
@@ -8,33 +8,112 @@ msgid ""
 msgstr ""
 "Project-Id-Version: laconica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: 2008-12-24 17:46+0100\n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-01-27 13:38+0000\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr "Ricerca \"%s\" nel flusso"
+msgstr " Ricerca \"%s\" nel flusso"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../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."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
-"a eccezione di questi dati personali: password, indirizzo email, indirizzo "
+" a eccezione di questi dati personali: password, indirizzo email, indirizzo "
 "messaggistica istantanea, numero di telefono."
 
-#: ../actions/subscribe.php:84
+# è 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"
+
+#: ../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."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -51,413 +130,826 @@ msgstr ""
 "Cordiali saluti,\n"
 "%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../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/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)"
+
 #  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
-#: ../actions/publicrss.php:60 ../actions/publicrss.php:62
-#: actions/publicrss.php:48
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
 #, php-format
 msgid "%s Public Stream"
 msgstr "Attività pubblica di %s"
 
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#: ../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 e amici"
 
-#: ../lib/util.php:233
+#  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"
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
+msgid "%s status"
+msgstr "stato di %s"
+
+#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
+#, php-format
+msgid "%s timeline"
+msgstr "Attività di %s"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "Aggiornamenti di %s da tutti!"
+
+#: ../actions/register.php:213
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(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.)"
+
+#: ../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%%** è un servizio di micro-blog offerto da "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)."
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** è un servizio di micro-blog."
+msgstr "**%%site.name%%** è un servizio di micro-blog. "
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
-". I collaboratori devono essere indicati col loro nome completo o "
-"soprannome."
+". I collaboratori devono essere indicati col loro nome completo o soprannome."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: 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 lettere minuscole o numeri, senza spazi o simboli di "
-"punteggiatura"
+"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/password.php:42 ../actions/register.php:178
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
 msgstr "6 o più caratteri"
 
 #  messa al femminile... dovrebbe essere la password
-#: ../actions/recoverpassword.php:165
+#: ../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/imsettings.php:188
+#  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/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
 "Un codice di conferma è stato inviato all'indirizzo di messaggistica "
-"istantanea che hai aggiunto. Devi approvare %s affinché ti invii "
-"messaggi."
+"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/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"Un codice di conferma è stato inviato al numero di telefono che hai "
+"aggiunto. Controlla la tua casella di posta (e anche la posta indesiderata!) "
+"per il codice e le istruzioni su come usarlo."
 
-#: ../lib/util.php:296 ../lib/util.php:324 lib/util.php:340
+#: ../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 "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/twitapilaconica.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:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "Accetta"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "Aggiungi OpenID"
 
-#: ../actions/imsettings.php:39
+#  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/showstream.php:254
+#: ../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/publicrss.php:62
+#: ../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/noticesearchrss.php:66
+#: ../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/finishopenidlogin.php:29 ../actions/login.php:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "Già abbonato!"
 
-#: ../actions/userauthorization.php:76
+#: ../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/userauthorization.php:77 actions/userauthorization.php:83
+#: actions/userauthorization.php:81
 msgid "Authorize subscription"
 msgstr "Autorizza abbonamento"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
 
-#: ../actions/avatar.php:32
+#: ../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/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/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "Immagine aggiornata."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"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?)."
+"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:1136
+#: ../lib/util.php:1318 lib/util.php:1452
 msgid "Before »"
 msgstr "Precedenti »"
 
-#: ../actions/profilesettings.php:52
+#: ../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:93 ../actions/updateprofile.php:102
+#: ../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)."
 
-#: ../actions/updateprofile.php:118 ../actions/updateprofile.php:119
-#: actions/updateprofile.php:120
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+msgid "Can't delete this notice."
+msgstr "Impossibile eliminare questo messaggio."
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
+#: actions/updateprofile.php:123
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Impossibile leggere l'URL \"%s\" dell'immagine"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+#: ../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/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../lib/openid.php:121
+#: ../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/imsettings.php:154
+#: ../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/password.php:45
+#: ../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/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "Modifica"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr "Modifica la gestione dell'email"
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Modifica password"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+msgid "Change your password"
+msgstr "Modifica la tua password"
+
+#: ../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/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/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Conferma indirizzo"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "Conferma annullata."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr "Codice di conferma"
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Codice di conferma non trovato."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+"Congratulazioni %s! Benvenuto/a in %%%%site.name%%%%. Da qui ora puoi...\n"
+"\n"
+"* Visitare il [tuo profilo](%s) e inviare il tuo primo messaggio.\n"
+"*Aggiungere un [indirizzo Jabber/GTalk](%%%%action.imsettings%%%%) per usare "
+"quel servizio per inviare messaggi.\n"
+"*[Ricercare persone](%%%%action.peoplesearch%%%%) che potresti conoscere o "
+"che condividono i tuoi stessi interessi.\n"
+"* Aggiornare le [tue impostazioni](%%%%action.profilesettings%%%%) per "
+"fornire agli altri più informazioni su di te.\n"
+"* Leggere la [documentazione in rete](%%%%doc.help%%%%) per le "
+"caratteristiche che magari non hai ancora visto. \n"
+"\n"
+"Grazie per esserti iscritto/a e speriamo tu possa divertiti usando questo "
+"servizio."
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "Connetti"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "Collega a un account esistente"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Contatti"
 
-#: ../lib/openid.php:178
+#: ../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"
 
-#: ../lib/openid.php:160
+#: ../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/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."
+
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Impossibile redirigere al server: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../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:154
+#: ../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"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Impossibile confermare l'email."
+#: ../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."
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+msgid "Could not subscribe."
+msgstr "Impossibile abbonarsi."
+
+#: ../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/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
-"Impossibile convertire le credenziali di richiesta in credenziali di "
-"accesso."
-
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Impossibile creare l'abbonamento."
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+"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."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
 msgstr "Impossibile eliminare l'abbonamento."
 
-#: ../actions/remotesubscribe.php:125
+#: ../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/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/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: 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/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
 msgid "Couldn't insert new subscription."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
-#: ../actions/profilesettings.php:175
+#: ../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/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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/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/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/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Crea"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "Crea un nuovo account"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:231
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Creazione nuovo account per OpenID che ha già un utente."
 
-#: ../actions/imsettings.php:45
+#: ../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/showstream.php:337
+#: ../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/emailsettings.php:44 actions/emailsettings.php:45
+#: actions/emailsettings.php:99
+msgid "Current confirmed email address."
+msgstr "Indirizzo email attualmente confermato."
+
+# 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 "Attualmente"
+msgstr "In questo momento:"
+
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Errore del DB nell'inserire un hashtag: %s"
 
-#: ../lib/util.php:893
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
-msgstr "Errore nel DB nell'inserire la risposta: %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"
 
-#: ../actions/profilesettings.php:54
+# 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 "Descrivi te stesso e i tuoi interessi in 140 caratteri"
+msgstr "Descriviti assieme ai tuoi interessi in 140 caratteri"
 
-#: ../actions/register.php:181
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "Email"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
+msgid "Email Address"
 msgstr "Indirizzo email"
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Impostazioni email"
+
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
 msgid "Email address already exists."
 msgstr "Indirizzo email già esistente."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
 msgstr "Conferma indirizzo email"
 
-#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
-#: actions/recoverpassword.php:197
+#: ../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/invite.php:129 actions/invite.php:137 actions/invite.php:174
+msgid "Email addresses"
+msgstr "Indirizzi email"
+
+#: ../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/userauthorization.php:136
+#: ../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/userauthorization.php:137 actions/userauthorization.php:144
+#: actions/userauthorization.php:161
 msgid "Error authorizing token"
 msgstr "Errore nell'autorizzare il token"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../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/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+#: actions/finishaddopenid.php:126
 msgid "Error connecting user."
 msgstr "Errore nel connettere l'utente."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
 msgid "Error inserting avatar"
 msgstr "Errore nell'inserire l'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/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Errore nell'inserire un messaggio"
-
 #: ../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/recoverpassword.php:201
+#: ../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/userauthorization.php:139
+#: ../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/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving the profile."
 msgstr "Errore nel salvare il profilo."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
 msgid "Error saving the user."
 msgstr "Errore nel salvare l'utente."
 
-#: ../actions/password.php:80
+#: ../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/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 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/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
 msgid "Error updating profile"
 msgstr "Errore nell'aggiornare il profilo"
 
 #: ../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/recoverpassword.php:79
+#: ../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/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "Soprannome esistente"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "FAQ"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "Errore nell'aggiornare l'immagine."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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:61 ../actions/repliesrss.php:80
+#: ../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/login.php:118
+#: ../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"
+
+#: ../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/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -465,39 +957,69 @@ msgstr ""
 "Per motivi di sicurezza è necessario reinserire il proprio nome utente e la "
 "propria password prima di modificare le impostazioni."
 
-#: ../actions/profilesettings.php:44
+#: ../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/profilesettings.php:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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)"
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../lib/util.php:274 ../lib/util.php:298 lib/util.php:314
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "Home"
 
-#: ../actions/profilesettings.php:49
+#: ../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/profilesettings.php:87
+#: ../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/imsettings.php:61
+#: ../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"
+
+#  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/imsettings.php:60 actions/imsettings.php:61
+#: actions/imsettings.php:118
 msgid "IM Address"
 msgstr "Indirizzo di messaggistica istantanea"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "Impostazioni messaggistica istantanea"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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."
@@ -513,23 +1035,36 @@ msgstr ""
 "Se vuoi aggiungere un OpenID al tuo account, inseriscilo nel riquadro "
 "sottostante e fai clic su \"Aggiungi\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"Se hai dimenticato o perso la tua password, puoi riceverne una nuova "
-"all'indirizzo email memorizzato nel tuo account."
+"Se hai dimenticato o perso la tua password, puoi fartene inviare una nuova "
+"per email all'indirizzo indicato nel tuo profilo."
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+#: actions/emailsettings.php:127 actions/smssettings.php:140
+msgid "Incoming email"
+msgstr "Email di ricezione"
 
-#: ../actions/password.php:69
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:443
+msgid "Incoming email address removed."
+msgstr "Indirizzo email di ricezione rimosso."
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153
 msgid "Incorrect old password"
 msgstr "Vecchia password non corretta"
 
-#: ../actions/login.php:63
+#: ../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/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -537,74 +1072,107 @@ msgstr ""
 "Le istruzioni per recuperare la tua password sono state inviate "
 "all'indirizzo email registrato nel tuo account."
 
-#: ../actions/updateprofile.php:113 ../actions/updateprofile.php:114
-#: actions/updateprofile.php:115
+#: ../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/updateprofile.php:97 ../actions/updateprofile.php:98
-#: actions/updateprofile.php:99
+#: ../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/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Pagina web \"%s\" non valida"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, 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"
 
-#: ../actions/updateprofile.php:86 ../actions/updateprofile.php:87
-#: actions/updateprofile.php:88
+#: ../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/remotesubscribe.php:96
+#: ../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/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/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Dimensione non valida."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
 msgid "Invalid username or password."
 msgstr "Nome utente o password non valido."
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+msgid "Invitation(s) sent"
+msgstr "Inviti inviati"
+
+#: ../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:"
+
+#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
+#: lib/subgroupnav.php:103
+msgid "Invite"
+msgstr "Invita"
+
+#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+msgid "Invite new users"
+msgstr "Invita nuovi utenti"
+
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, php-format
 msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-" Gestito dal software di micro-blog [Laconica](http://laconi.ca/), versione "
+"Gestito dal software di micro-blog [Laconica](http://laconi.ca/), versione "
 "%s, disponibile sotto licenza [GNU Affero General Public "
 "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../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/imsettings.php:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -614,450 +1182,789 @@ msgstr ""
 "cosa, assicurati di aggiungere %s all'elenco dei contatti nel tuo programma "
 "di messaggistica o su GTalk."
 
-#: ../actions/profilesettings.php:55
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:128
+msgid "Language"
+msgstr "Lingua"
+
+#: ../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/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/profilesettings.php:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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/login.php:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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/openidlogin.php:44
+#: ../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/login.php:122
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
-"Accedi con nome utente e password. Non hai ancora un nome utente? "
-"[Registra](%%action.register%%) un nuovo account o prova "
-"[OpenID](%%action.openidlogin%%). "
+"Accedi con nome utente e password. Non hai ancora un nome utente? [Registra]"
+"(%%action.register%%) un nuovo account o prova [OpenID](%%action.openidlogin%"
+"%). "
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Esci"
 
-#: ../actions/login.php:106
+#: ../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/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/showstream.php:281
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+"Crea un nuovo indirizzo email a cui inviare i messaggi, rimuove quello "
+"vecchio."
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: 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 "
+msgstr "Membro dal"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "Micro-blog di %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+"Operatore di telefonia mobile. Se conosci un operatore che accetta gli SMS "
+"via email, ma non è elencato qui, scrivici a %s."
+
+#: ../actions/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"
+msgstr "I miei testi e file sono disponibili sotto "
+
+#: ../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"
+
+#: ../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:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:465
+msgid "New incoming email address added."
+msgstr "Nuovo indirizzo email di ricezione aggiunto."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+#: actions/finishopenidlogin.php:99
 msgid "New nickname"
 msgstr "Nuovo soprannome"
 
-#: ../actions/newnotice.php:100 ../actions/newnotice.php:87
-#: actions/newnotice.php:96
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "Nuovo messaggio"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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/recoverpassword.php:275 ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
 
-#: ../actions/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175 ../actions/login.php:101
+#: ../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/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59 ../actions/profilesettings.php:110
+#: ../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/finishopenidlogin.php:165 ../actions/profilesettings.php:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
-#: ../actions/profilesettings.php:88 ../actions/register.php:67
-#: ../actions/updateprofile.php:77 actions/finishopenidlogin.php:171
-#: actions/profilesettings.php:203 actions/register.php:74
-#: actions/updateprofile.php:78
+#: ../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 ""
 "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:147 ../actions/recoverpassword.php:162
-#: actions/recoverpassword.php:167
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "Soprannome o email"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
+msgid "No"
+msgstr "No"
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
+#: actions/imsettings.php:279
 msgid "No Jabber ID."
 msgstr "Nessun ID di Jabber."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "Nessuna richiesta di autorizzazione!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+#: actions/smssettings.php:299
+msgid "No carrier selected."
+msgstr "Nessun operatore selezionato."
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+#: actions/smssettings.php:486
+msgid "No code entered"
+msgstr "Nessun codice inserito"
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
+#: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "Nessun codice di conferma."
 
-#: ../actions/newnotice.php:49
+#: ../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/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:304
+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."
+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/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
 msgid "No nickname provided by remote server."
 msgstr "Nessun soprannome fornito dal server remoto."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
 msgstr "Nessun soprannome."
 
-#: ../actions/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: actions/emailsettings.php:363 actions/imsettings.php:345
+#: actions/smssettings.php:358
 msgid "No pending confirmation to cancel."
 msgstr "Nessuna conferma da annullare."
 
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+#: actions/smssettings.php:294
+msgid "No phone number."
+msgstr "Nessun numero di telefono."
+
 #: ../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/recoverpassword.php:189
+#: ../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/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
 msgid "No request found!"
 msgstr "Nessuna richiesta trovata!"
 
 #: ../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/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "Nessuna dimensione."
 
-#: ../actions/openidsettings.php:135
+#: ../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/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/openidsettings.php:135 actions/openidsettings.php:144
+#: actions/openidsettings.php:222
 msgid "No such OpenID."
 msgstr "Nessun tale OpenID."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "Nessun tale documento."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
-#: ../actions/shownotice.php:83 ../lib/deleteaction.php:30
-#: actions/shownotice.php:32 actions/shownotice.php:83 lib/deleteaction.php:30
+#: ../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/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+#: actions/recoverpassword.php:62
 msgid "No such recovery code."
 msgstr "Nessun codice di ripristino."
 
-#: ../actions/postnotice.php:56
+#: ../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:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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."
 
-#: ../lib/gallery.php:76
+#: ../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."
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Nessuno da mostrare!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+#: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr "Non è un codice di ripristino."
 
-#: ../actions/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Non è un utente registrato."
+
+#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
+#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
+#: lib/twitterapi.php:502 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/imsettings.php:167 actions/imsettings.php:175
+#: actions/imsettings.php:290
 msgid "Not a valid Jabber ID"
 msgstr "Non è un ID Jabber valido"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "Non è un OpenID valido."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../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/register.php:63 actions/register.php:70 actions/register.php:152
 msgid "Not a valid email address."
 msgstr "Non è un indirizzo email valido."
 
-#: ../actions/profilesettings.php:83 ../actions/register.php:61
 #: ../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/remotesubscribe.php:118
+#: ../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/remotesubscribe.php:111
+#: ../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/remotesubscribe.php:104
+#: ../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/avatar.php:95
+#: ../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/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "Non autorizzato."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "Non aspettavo questa risposta!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/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."
 
-#: ../actions/unsubscribe.php:43
+#: ../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:297 ../actions/showstream.php:316
-#: actions/showstream.php:331
+#: ../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/password.php:39
+#: ../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"
 
-#: ../lib/util.php:288
+#: ../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: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: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/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:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Errore OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "Impostazioni OpenID"
 
-#: ../actions/avatar.php:84
+#: ../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/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "Caricamento parziale."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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/recoverpassword.php:249
+#: ../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/recoverpassword.php:245
+#: ../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/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../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/password.php:89 ../actions/recoverpassword.php:274
+#: ../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/password.php:61 ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Persone"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Ricerca persone"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Ricerca persone"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "Personale"
 
-#: ../actions/userauthorization.php:77 ../actions/userauthorization.php:78
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr "Messaggio personale"
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
+
+#: ../actions/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 ""
 "Controlla i dettagli seguenti per essere sicuro di volerti abbonare ai "
-"messaggi di questo utente. Se non hai richiesto ciò, fai clic su "
-"\"Annulla\"."
+"messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Annulla\"."
 
-#: ../actions/imsettings.php:74
+#: ../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/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
-#: ../lib/util.php:300
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:129
+msgid "Preferred language"
+msgstr "Lingua preferita"
+
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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."
 
-#: ../lib/stream.php:54
+#: ../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/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "URL del profilo"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
 msgstr "Impostazioni del profilo"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Pubblico"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Feed del flusso pubblico"
 
 #  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "Attività pubblica"
 
-#: ../actions/recoverpassword.php:151
+#: ../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/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/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr "Etichette recenti"
+
+# 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 "Recupero"
+msgstr "Recupera"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198
 msgid "Recover password"
 msgstr "Recupero password"
 
-#: ../actions/recoverpassword.php:67
+#: ../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/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: 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/userauthorization.php:119
+#: ../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/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr "Registrazione riuscita"
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "Rifiuta"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../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/updateprofile.php:69
+#: ../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/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "Abbonamento remoto"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: 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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "Rimuovi OpenID"
 
@@ -1069,40 +1976,83 @@ msgstr ""
 "Rimuovere il tuo unico OpenID renderà impossibile effettuare l'accesso! Se "
 "vuoi rimuoverlo, prima aggiungi un altro OpenID."
 
-#: ../lib/stream.php:49
+#: ../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:50
+#: ../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 "Risposte a %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "Reimposta"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "Reimposta password"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr "Numero di telefono per SMS"
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Impostazioni SMS"
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr "Conferma SMS"
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
 msgid "Same as password above"
 msgstr "Stessa password di sopra"
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#  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/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"
 
-#: ../lib/searchaction.php:73 ../lib/util.php:277
+#: ../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/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "Ricerca nel flusso dei feed"
 
 #: ../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 "
@@ -1120,118 +2070,246 @@ msgstr ""
 "Ricerca le persone su %%site.name%% per nome, ubicazione o interessi. Separa "
 "i termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
-#: ../lib/util.php:982
+#: ../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/imsettings.php:71 ../actions/imsettings.php:70
-#: actions/imsettings.php:71
+#: ../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"
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
+#: actions/imsettings.php:137
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Inviami le notifiche via Jabber/GTalk"
 
-#: ../lib/util.php:282
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Inviami avvisi via SMS: comprendo che potrei incorrere in esorbitanti "
+"bollette da parte del mio operatore"
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr "Inviami le risposte delle persone a cui sono abbonato via Jabber/GTalk"
+
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "Impostazioni salvate."
 
-#: ../actions/finishaddopenid.php:66
+#: ../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."
 
-#: ../lib/util.php:302
+#: ../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:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../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:172
-#: ../actions/showstream.php:181
+#: ../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:294 ../actions/subscribers.php:27
-#: ../actions/showstream.php:313 actions/showstream.php:328
-#: actions/subscribers.php:27
+#: ../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:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "Abbonamento autorizzato"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "Abbonamento rifiutato"
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../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/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/noticesearch.php:34
+#: ../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: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:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "Quell'indirizzo è già stato confermato."
 
-#: ../actions/confirmaddress.php:43
+#: ../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/avatar.php:80
+#: ../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/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:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr "Quello è già il tuo ID di Jabber."
 
-#: ../actions/imsettings.php:224
+#: ../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."
 
-#: ../actions/imsettings.php:201
+#  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/newnotice.php:52
+#: ../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/confirmaddress.php:86 ../actions/confirmaddress.php:92
-#: actions/confirmaddress.php:92
+#: ../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/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "L'indirizzo \"%s\" è stato confermato per il tuo account."
 
-#: ../actions/imsettings.php:241
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: 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:311
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
@@ -1241,7 +2319,7 @@ msgstr ""
 "richiamo. Controlla le istruzioni del sito per i dettagli su come "
 "autorizzare l'abbonamento. Il tuo token per l'abbonamento è:"
 
-#: ../actions/userauthorization.php:321
+#: ../actions/userauthorization.php:322
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
@@ -1260,16 +2338,22 @@ msgstr "Queste sono le persone che seguono %s."
 msgid "These are the people who listen to your notices."
 msgstr "Queste sono le persone che ti seguono."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Queste sono le persone seguite da %s."
 
-#: ../actions/subscriptions.php:33
+#: ../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."
 
-#: ../actions/recoverpassword.php:87
+#: ../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 ""
+"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."
 
@@ -1281,81 +2365,156 @@ 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: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 ""
-"Questa è la prima volta in cui accedi a %s quindi è necessario collegare "
-"il tuo OpenID a un account locale. Puoi crearne uno nuovo o collegarlo con "
-"il tuo account esistente, se ne hai uno."
+"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."
+
+#: ../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."
 
-#: ../lib/util.php:147
+#: ../lib/util.php:164 lib/util.php:246
 msgid "This page is not available in a media type you accept"
 msgstr "Questa pagina non è disponibile in un tipo di supporto che tu accetti"
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138
+msgid "Timezone"
+msgstr "Fuso orario"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr "Fuso orario non selezionato"
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
-"Per 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."
+"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:51
+#: ../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: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/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../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:237
+#: ../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"
+
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
 msgid "Unknown version of OMB protocol."
 msgstr "Versione del protocollo OMB sconosciuta."
 
-#: ../lib/util.php:245 ../lib/util.php:269 lib/util.php:285
+#: ../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 ""
 "Se non indicato diversamente, i diritti d'autore dei contenuti di questo "
-"sito sono dei singoli utenti e sono disponibili sotto"
+"sito sono dei singoli utenti e sono disponibili sotto "
 
-#: ../actions/confirmaddress.php:48
+#: ../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/showstream.php:193 ../actions/showstream.php:209
-#: actions/showstream.php:219
+# è 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 "Annulla abbonamento"
+msgstr "Disabbonati"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../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/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr "Formato file immagine non supportato."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr "Aggiornamenti via SMS"
+
+#: ../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/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:129
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Aggiornamenti da %1$s e amici su %2$s!"
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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"
 
@@ -1371,61 +2530,132 @@ msgstr ""
 "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"
+
+#: ../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."
+
 #  Femminile, è l'email
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Usata solo per aggiornamenti, annunci e recupero password"
 
 #: ../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/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../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/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "Soprannome dell'utente"
 
-#: ../lib/util.php:969 ../lib/util.php:1159 lib/util.php:1293
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr "Utente non trovato."
+
+#: ../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?"
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
 msgstr "Cosa succede %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../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\""
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipo di immagine errata per \"%s\""
 
-#: ../actions/updateprofile.php:122
+#: ../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/finishaddopenid.php:64
+#  "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/finishaddopenid.php:64 actions/finishaddopenid.php:64
+#: actions/finishaddopenid.php:112
 msgid "You already have this OpenID!"
 msgstr "Hai già questo 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 ""
+"Stai per eliminare definitivamente un messaggio. Una volta fatto non sarà "
+"possibile recuperarlo."
+
 #: ../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/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/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/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Qui puoi cambiare la tua password. Scegline una buona!"
 
-#: ../actions/register.php:164 ../actions/register.php:135
-#: actions/register.php:145
+#: ../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/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/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -1435,8 +2665,8 @@ msgstr "Puoi rimuovere un OpenID dal tuo account facendo clic su \"Rimuovi\"."
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
 "Puoi inviare e ricevere messaggi attraverso i servizi di [messaggistica "
 "istantanea](%%doc.im%%) Jabber/GTalk. Configura il tuo indirizzo e le "
@@ -1444,37 +2674,82 @@ msgstr ""
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"Puoi aggiornare le informazioni del tuo profilo personale qui, così gli "
+"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:51
+#: ../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:62
+#: ../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"
 
-#: ../actions/recoverpassword.php:134
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+"Hai un nuovo indirizzo di invio su %1$s.\n"
+"\n"
+"Scrivi le email a %2$s per inviare nuovi messaggi.\n"
+"\n"
+"Puoi trovare maggiori informazioni presso %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
+#, 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 stato identificato. Inserisci una nuova password qui sotto."
+msgstr "Sei ora identificato/a. Inserisci una nuova password qui di seguito. "
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "Il tuo URL OpenID"
 
-#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Il tuo soprannome su questo server o il tuo indirizzo email "
-"registrato."
+"Il tuo soprannome su questo server o il tuo indirizzo email registrato."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -1485,879 +2760,82 @@ 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:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "pochi secondi fa"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "circa %d giorni fa"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "circa %d ore fa"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr "circa %d minuti fa"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr "circa %d mesi fa"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "circa un giorno fa"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "circa un minuto fa"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "circa un mese fa"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "circa un anno fa"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "circa un'ora fa"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "rispondi"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "stessa password di sopra"
 
-#: ../lib/util.php:1127 ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr "« Successivi"
-
-#  Non ne sono sicuro, ma dovrebbe essere quello che si vede come descrizione da dove si è inviato il messaggio. Mettere 'da' non suona bene ('da web', 'da api'...), 'via' mi pare la soluzione migliore ('via web', 'via api', 'via Twhirl'...).
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr "via"
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Aggiornamenti in risposta a %2$s"
-
-#  %USERNAME has invited you to join THEM on %site. You start with a singular and end with a plural???
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s ti invita a seguirlo su %2$s"
-
-#  link -> collegamento
-#  micro-blogging -> micro-blog
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-"%1$s ti invita a seguirlo su %2$s (%3$s).\n"
-"\n"
-"%2$s è un servizio di micro-blog che ti consente di rimanere aggiornato "
-"sulle persone che conosci e che ti interessano.\n"
-"\n"
-"Puoi anche condividere notizie che ti riguardano, i tuoi pensieri o la tua "
-"vita in rete con le persone che ti conoscono. È anche un ottimo strumento "
-"per conoscere nuove persone che condividono i tuoi stessi interessi.\n"
-"\n"
-"%1$s ha scritto:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Puoi vedere il profilo di %1$s su %2$s qui:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Se vuoi provare il servizio, fai clic sul collegamento qui sotto per "
-"accettare l'invito:\n"
-"\n"
-"%6$s\n"
-"\n"
-"Se non è ciò che vuoi, ignora semplicemente questo messaggio. Grazie per "
-"aver letto questo invito e per il tuo tempo!\n"
-"\n"
-"Cordiali saluti, %2$s\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s aggiornamenti in risposta agli aggiornamenti da %2$s / %3$s"
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr "attività pubblica di %s"
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr "stato di %s"
-
-#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr "Attività di %s"
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr "Aggiornamenti di %s da tutti!"
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-"(Dovresti ricevere, entro breve, un messaggio email con istruzioni su come "
-"confermare il tuo indirizzo email.)"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 lettere minuscole o numeri, niente punteggiatura o spazi. "
-"Richiesto."
-
-#  Femminile, è la password
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-msgstr "6 o più caratteri. Richiesta."
-
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Un codice di conferma è stato inviato all'indirizzo di posta da te "
-"aggiunto. Controlla la tua casella di posta (e anche la posta indesiderata!) "
-"per il codice e le istruzioni su come usarlo."
-
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Un codice di conferma è stato inviato al numero di telefono da te aggiunto. "
-"Controlla la tua casella di posta (e anche la posta indesiderata!) per il "
-"codice e le istruzioni su come usarlo."
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
-msgstr "Metodo delle API non trovato!"
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
-msgstr "Metodo delle API in lavorazione."
-
-#  we don't use 's' in plurals even from english words.
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr "Aggiungi o rimuovi OpenID"
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Indirizzi email di amici da invitare (uno per riga)"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr "Sei sicuro di voler eliminare questo messaggio?"
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-"Abbonami automaticamente a chi si abbona ai miei messaggi (utile per i "
-"non-umani)"
-
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"Attesa la conferma per questo indirizzo. Controlla la tua casella di posta "
-"(e anche la posta indesiderata!) per un messaggio con ulteriori "
-"istruzioni."
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr "Attesa la conferma per questo numero di telefono."
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr "Impossibile eliminare questo messaggio."
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr "Impossibile normalizzare l'indirizzo email"
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr "Modifica la gestione dell'email"
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr "Modifica la tua password"
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr "Modifica le impostazioni del tuo profilo"
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr "Codice di conferma"
-
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-"Congratulazioni %s! Benvenuto/a in %%%%site.name%%%%. Da qui ora "
-"puoi...\n"
-"\n"
-"* Visitare il [tuo profilo](%s) e inviare il tuo primo messaggio.\n"
-"*Aggiungere un [indirizzo Jabber/GTalk](%%%%action.imsettings%%%%) per usare "
-"quel servizio per inviare messaggi.\n"
-"*[Ricercare persone](%%%%action.peoplesearch%%%%) che potresti conoscere o "
-"che condividono i tuoi stessi interessi.\n"
-"* Aggiornare le [tue impostazioni](%%%%action.profilesettings%%%%) per "
-"fornire agli altri più informazioni su di te.\n"
-"* Leggere la [documentazione in rete](%%%%doc.help%%%%) per le "
-"caratteristiche che magari non hai ancora visto.\n"
-"\n"
-"Grazie per esserti iscritto/a e speriamo tu possa divertiti usando questo "
-"servizio."
-
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Impossibile seguire l'utente: %s è già nel tuo elenco."
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr "Impossibile seguire l'utente: utente non trovato."
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr "Impossibile abbonare altri a te."
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr "Impossibile abbonarsi."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr "Impossibile aggiornare l'utente con l'indirizzo email confermato."
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr "Impossibile trovare un qualsiasi stato."
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr "Impossibile aggiornare l'utente per auto-abbonarsi."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr "Impossibile aggiornare i record dell'utente."
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Numero di telefono attualmente confermato per gli SMS."
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr "Indirizzo email attualmente confermato."
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Errore del DB nell'inserire un hastag: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr "Elimina messaggio"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr "Indirizzo email"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr "Impostazioni email"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Indirizzo email, del tipo \"NomeUtente@example.org\""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr "Indirizzi email"
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr "Inserisci il codice che hai ricevuto sul tuo telefono."
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Feed per l'etichetta %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr "Ricerca contenuto dei messaggi"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr "Ricerca persone in questo sito"
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr "Voglio inviare i messaggi via email"
-
-#  Non è il massimo (Messaggistica Istantanea), ma non lo è nemmeno in inglese, questo tipo di abbreviazioni sarebbe da evitare sempre...
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr "MI"
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-"Se hai dimenticato o perso la tua password, puoi fartene inviare una nuova "
-"per email all'indirizzo indicato nel tuo profilo."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr "Email di ricezione"
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr "Indirizzo email di ricezione rimosso."
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Indirizzo email non valido: %s"
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr "Inviti inviati"
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr "Inviti inviati ai seguenti indirizzi:"
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr "Invita"
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr "Invita nuovi utenti"
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr "Lingua"
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr "La lingua è troppo lunga (max 50 caratteri)"
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-"Crea un nuovo indirizzo email a cui inviare i messaggi, rimuove quello "
-"vecchio."
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Gestisci la ricezione delle email da %%site.name%%."
-
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-"Operatore di telefonia mobile. Se conosci un operatore che accetta gli SMS "
-"via email, ma non è elencato qui, scrivici a %s."
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr "Nuovo"
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Nuovo indirizzo email per inviare messaggi a %s"
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr "Nuovo indirizzo email di ricezione aggiunto."
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr "No"
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr "Nessun operatore selezionato."
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr "Nessun codice inserito"
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr "Nessun indirizzo email."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr "Nessun indirizzo email di ricezione."
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr "Nessun numero di telefono."
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr "Nessuno stato trovato con quel ID."
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr "Nessuno stato con quel ID trovato."
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr "Nessun utente con quell'email o nome utente."
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr "Non è un utente registrato."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
-msgstr "Non è un formato di dati supportato."
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr "Non è un indirizzo email valido"
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr "Non trovato"
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr "Ricerca messaggi"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Messaggi etichettati con %s"
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr "Puoi aggiungere un messaggio personale agli inviti."
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr "Persone"
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr "Ricerca persone"
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr "Messaggio personale"
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr "Lingua preferita"
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr "Pubblica un MicroID per il mio indirizzo email"
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Etichette recenti"
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr "Registrazione non consentita."
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr "Registrazione riuscita"
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr "SMS"
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr "Numero di telefono per SMS"
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr "Impostazioni SMS"
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr "Conferma SMS"
-
-#  Femminile, è la password
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr "Stessa password di sopra. Richiesta."
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-msgstr "Seleziona un operatore"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr "Invia le email a questo indirizzo per scrivere nuovi messaggi."
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr "Inviami avvisi di nuovi abbonamenti via email"
-
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
-"Inviami avvisi via SMS: comprendo che potrei incorrere in esorbitanti "
-"bollette da parte del mio operatore"
-
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Inviami le risposte delle persone a cui sono abbonato via Jabber/GTalk"
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Le etichette più popolari dell'ultima settimana"
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr "Email di ricezione non consentita."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr "Quella non è la tua email di ricezione."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr "Etichette"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Testo"
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Qeull'indirizzo email appartiene già a un altro utente."
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr "Quello è già il tuo indirizzo email."
-
-#  previous suggestion missed the dot
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr "Quello è già il tuo numero di telefono."
-
-#  previous suggestion missed the dot
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr "Quello non è il tuo indirizzo email."
-
-#  previous suggestion missed the dot
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr "Quello non è il tuo numero di telefono."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr "Quello è il numero di conferma errato."
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr "Quel numero di telefono appartiene già a un altro utente."
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Troppo lungo. Massimo 255 caratteri."
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-msgstr ""
-"Queste persone sono già utenti e sei stato automaticamente abbonato a "
-"loro:"
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
-msgstr "Questo metodo richiede POST o DELETE."
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
-msgstr "Questo metodo richiede POST."
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr "Fuso orario"
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr "Fuso orario non selezionato"
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Devono essere forniti due ID utente o nominativi."
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr "Azione sconosciuta"
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr "Aggiornamenti via SMS"
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr "Aggiornamenti via messaggistica istantanea (MI)"
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Aggiornamenti da %1$s e amici su %2$s!"
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Aggiornamenti da %1$s su %2$s!"
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Carica una nuova immagine per il profilo"
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-"Usa questo modulo per invitare i tuoi amici e colleghi a usare questo "
-"servizio."
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Utente non trovato."
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr "In che fuso orario risiedi solitamente?"
-
-#  "si" is the last musical note in the "do scale". "sì" is the correct Italian translation for "yes".
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-msgstr "Sì"
-
-#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-"Stai per eliminare definitivamente un messaggio. Una volta fatto non sarà "
-"possibile recuperarlo."
-
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr "Sei già abbonato a questi utenti:"
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr "Non sei amico dell'utente specificato."
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Puoi ricevere messaggi SMS attraverso l'email da %%site.name%%."
-
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-"Hai un nuovo indirizzo di invio su %1$s.\n"
-"\n"
-"Scrivi le email a %2$S per inviare nuovi messaggi.\n"
-"\n"
-"Puoi trovare maggiori informazioni presso %£4s.\n"
-"\n"
-"Cordiali saluti,\n"
-"%4$s"
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr "Non puoi eliminare lo stato di un altro utente."
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "Devi eseguire l'accesso per invitare altri utenti a usare %s"
-
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-"Verrai avvisato quando i tuoi invitati accetteranno e si registreranno sul "
-"sito. Grazie per l'aiuto ad accrescere la comunità!"
-
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "elimina"
-
 #  wrong capitalization in previous suggestion
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: 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
@@ -2367,37 +2845,42 @@ msgstr "tipo di file non supportato"
 #: 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/disfavor.php:55
+#: actions/disfavor.php:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr "Questo messaggio non è un preferito!"
 
-#: actions/disfavor.php:63
+#: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Impossibile eliminare un preferito."
 
-#: actions/disfavor.php:72
+#: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
 msgstr "Preferito"
 
 #: actions/emailsettings.php:92
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
-"Inviami un'email quando qualcuno aggiunge un mio messaggio ai "
-"preferiti"
+"Inviami un'email quando qualcuno aggiunge un mio messaggio ai preferiti"
 
-#: actions/emailsettings.php:95
+#: 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: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
+#: 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."
 
@@ -2406,157 +2889,165 @@ msgid "Disfavor"
 msgstr "Non preferito"
 
 #: 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/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Feed dei messaggi preferiti di %s"
 
-#: actions/inbox.php:28
+#: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
 msgstr "Casella posta in arrivo di %s - pagina %d"
 
-#: actions/inbox.php:30
+#: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 msgstr "Casella posta in arrivo di %s"
 
-#: actions/inbox.php:53
+#: 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/invite.php:178
+#: 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 ti ha invitato a unirti a loro su %2$s (%3$s).\n"
+"Hai ricevuto un invito per seguire %1$s su %2$s (%3$s).\n"
 "\n"
 
-#: actions/login.php:104
+#: 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;"
+msgstr "Accesso automatico in futuro; "
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
-msgstr "Per motivi di sicurezza reinserire la propria"
+msgstr "Per motivi di sicurezza reinserire la propria "
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:268
 msgid "Login with your username and password. "
-msgstr "Accedi con il tuo nome utente e password."
+msgstr "Accedi con il tuo nome utente e password. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/twitapidirect_messages.php:141
 msgid "That's too long. Max message size is 140 chars."
 msgstr "Troppo lungo. Il massimo per un messaggio è 140 caratteri."
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:128
 msgid "No recipient specified."
 msgstr "Nessun destinatario specificato."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: 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/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: 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."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
 msgid "No such user"
 msgstr "Nessun tale utente"
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "New message"
 msgstr "Nuovo messaggio"
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
-msgstr "Messaggi senza un profilo corrispondente"
+msgstr "Messaggio senza un profilo corrispondente"
 
-#: actions/openidsettings.php:28
+#: 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"
+msgstr "[OpenID](%%doc.openid%%) ti consente di collegarti a molti siti "
 
-#: actions/openidsettings.php:46
+#: 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,"
+msgstr "Se vuoi aggiungere un OpenID al tuo account, "
 
 #: actions/openidsettings.php:74
 msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Rimuovere il tuo unico OpenID ti impedirebbe di eseguire l'accesso!"
+msgstr "Rimuovere il tuo unico OpenID ti impedirà di eseguire l'accesso! "
 
-#: actions/openidsettings.php:87
+#: 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"
+msgstr "Puoi rimuovere un OpenID dal tuo account "
 
-#: actions/outbox.php:28
+#: actions/outbox.php:28 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:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Casella posta inviata di %s"
 
-#: actions/outbox.php:53
+#: actions/outbox.php:53 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."
+"Questa è la casella della tua posta inviata, contiene i messaggi privati che "
+"hai inviato."
 
-#: actions/peoplesearch.php:28
+#: 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."
+msgstr "Ricerca persone su %%site.name%% per nome, ubicazione o interessi. "
 
-#: actions/profilesettings.php:27
+#: 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"
+msgstr "Qui puoi aggiornare il tuo profilo personale "
 
 #: 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/recoverpassword.php:91
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
-msgstr "Questo codice di conferma è troppo vecchio."
+msgstr "Questo codice di conferma è troppo vecchio. "
 
-#: actions/recoverpassword.php:141
+#: 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/recoverpassword.php:154
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
-msgstr "Sei ora identificato. Inserisci un"
+msgstr "Sei ora identificato. Inserisci un "
 
-#: actions/recoverpassword.php:169
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
-msgstr "Il tuo soprannome su questo server,"
+msgstr "Il tuo soprannome su questo server, "
 
-#: actions/recoverpassword.php:271
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
-msgstr "Istruzioni per il recupero della password"
+msgstr "Istruzioni per il recupero della password "
 
-#: actions/recoverpassword.php:327
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
-msgstr "Nuova password salvata con successo."
+msgstr "Nuova password salvata con successo. "
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
 msgstr "La password deve essere di 6 o più caratteri."
 
@@ -2566,28 +3057,28 @@ msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
-"Congratulazioni, %s! Benvenuto su %%%%site.name%%%%. Ora potresti "
-"voler..."
+"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"
+msgstr "(Dovresti ricevere, entro breve, un messaggio email con "
 
-#: actions/remotesubscribe.php:51
+#: 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: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 favoriti."
+msgstr "Impossibile recuperare i messaggi preferiti."
 
-#: actions/showmessage.php:33
+#: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
 msgstr "Nessun tale messaggio."
 
@@ -2595,12 +3086,12 @@ msgstr "Nessun tale messaggio."
 msgid "Only the sender and recipient may read this message."
 msgstr "Solo mittente e destinatario possono leggere questo messaggio."
 
-#: actions/showmessage.php:61
+#: 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/showmessage.php:66
+#: 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"
@@ -2609,58 +3100,63 @@ msgstr "Messaggio da %1$s su %2$s"
 msgid "Send a message"
 msgstr "Invia un messaggio"
 
-#: actions/smssettings.php:312
+#: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
-msgstr "Operatore mobile del tuo telefono."
+msgstr "Operatore mobile del tuo telefono. "
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Messaggi diretti a %s"
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, 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:81 actions/twitapidirect_messages.php:73
 msgid "Direct Messages You've Sent"
 msgstr "Messaggi diretti inviati"
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #, 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."
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Preferiti da %s"
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s aggiornamenti preferiti da %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 ha aggiunto il tuo messaggio tra i suoi preferiti"
 
 #: 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"
@@ -2674,17 +3170,17 @@ msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 "Aggiungi il tuo account Twitter per inviare automaticamente i tuoi messaggi "
-"su Twitter,"
+"su Twitter, "
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
 msgstr "Impostazioni Twitter"
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
 msgstr "Account Twitter"
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
 msgstr "Account Twitter attualmente verificato."
 
@@ -2692,7 +3188,7 @@ msgstr "Account Twitter attualmente verificato."
 msgid "Twitter Username"
 msgstr "Nome utente di Twitter"
 
-#: actions/twittersettings.php:65
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgid "No spaces, please."
 msgstr "Niente spazi, grazie."
 
@@ -2700,15 +3196,15 @@ msgstr "Niente spazi, grazie."
 msgid "Twitter Password"
 msgstr "Password di Twitter"
 
-#: actions/twittersettings.php:72
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
 msgstr "Invia automaticamente i miei messaggi a Twitter"
 
-#: actions/twittersettings.php:75
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Invia le risposte \"@\" locali a Twitter"
 
-#: actions/twittersettings.php:78
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Subscribe to my Twitter friends here."
 msgstr "Abbonami ai miei amici di Twitter"
 
@@ -2718,9 +3214,9 @@ msgid ""
 "underscore (_). 15 chars max."
 msgstr ""
 "Il nome utente deve contenere solo numeri, lettere maiuscole e minuscole e "
-"underscore (_) (max 15 caratteri)."
+"trattini bassi (_) (max 15 caratteri)."
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
 msgid "Could not verify your Twitter credentials!"
 msgstr "Impossibile verificare le tue credenziali di Twitter!"
 
@@ -2730,160 +3226,166 @@ 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:174 actions/twittersettings.php:376
 msgid "Twitter settings saved."
 msgstr "Impostazioni di Twitter salvate."
 
-#: actions/twittersettings.php:192
+#: 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: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."
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
 msgid "Twitter preferences saved."
 msgstr "Preferenze di Twitter salvate."
 
-#: actions/userauthorization.php:84
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
-msgstr "Controlla questi dettagli per assicurarti"
+msgstr "Controlla questi dettagli per assicurarti "
 
-#: actions/userauthorization.php:324
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
-msgstr "L'abbonamento è stato autorizzato, ma non"
+msgstr "L'abbonamento è stato autorizzato, ma non "
 
-#: actions/userauthorization.php:334
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
-msgstr "L'abbonamento è stato rifiutato, ma non"
+msgstr "L'abbonamento è stato rifiutato, ma non "
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
 msgid "Command results"
 msgstr "Risultati comando"
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:204
 msgid "Command complete"
 msgstr "Comando completato"
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:215
 msgid "Command failed"
 msgstr "Comando non riuscito"
 
-#: classes/Command.php:39
+#: classes/Command.php:39 classes/Command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "Questo comando non è ancora implementato"
 
-#: classes/Command.php:96
+#: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
 msgstr "Abbonamenti: %1$s\n"
 
-#: classes/Command.php:125 classes/Command.php:242
+#: 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:146 classes/Command.php:166
 msgid "Notice marked as fave."
 msgstr "Messaggio indicato come preferito."
 
-#: classes/Command.php:166
+#: classes/Command.php:166 classes/Command.php:189
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169
+#: classes/Command.php:169 classes/Command.php:192
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
 
-#: classes/Command.php:172
+#: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
 msgstr "Ubicazione: %s"
 
-#: classes/Command.php:175
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagina web: %s"
 
-#: classes/Command.php:178
+#: classes/Command.php:178 classes/Command.php:201
 #, php-format
 msgid "About: %s"
 msgstr "Informazioni: %s"
 
-#: classes/Command.php:200
+#: 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"
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Messaggio diretto a %s inviato"
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
 msgstr "Errore nell'inviare il messaggio diretto."
 
-#: classes/Command.php:263
+#: 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"
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:307
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Abbonato a %s"
 
-#: classes/Command.php:288
+#: 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"
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Abbonamento a %s annullato"
 
-#: classes/Command.php:310 classes/Command.php:330
+#: 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:313 classes/Command.php:356
 msgid "Notification off."
 msgstr "Notifiche disattivate."
 
-#: classes/Command.php:315
+#: 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:333 classes/Command.php:379
 msgid "Notification on."
 msgstr "Notifiche attivate."
 
-#: classes/Command.php:335
+#: 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:344 classes/Command.php:392
 msgid "Commands:\n"
 msgstr "Comandi:\n"
 
-#: classes/Message.php:53
+#: classes/Message.php:53 classes/Message.php:56
 msgid "Could not insert message."
 msgstr "Impossibile inserire messaggio."
 
-#: classes/Message.php:63
+#: 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."
 
@@ -2891,7 +3393,7 @@ msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
 msgid "User without matching profile in system."
 msgstr "Utente senza profilo corrispondente nel sistema."
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:289
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2900,12 +3402,12 @@ msgstr ""
 "Hai un nuovo indirizzo di ricezione su %1$s.\n"
 "\n"
 
-#: lib/mail.php:249
+#: 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:253 lib/mail.php:512
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -2914,55 +3416,1588 @@ msgstr ""
 "%1$s (%2$s) ti ha inviato un messaggio privato:\n"
 "\n"
 
-#: lib/mailbox.php:43
+#: 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."
 
-#: lib/openid.php:195
+#: lib/openid.php:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
-msgstr "Questo modulo dovrebbe inviarsi automaticamente."
+msgstr "Questo modulo dovrebbe inviarsi automaticamente. "
 
-#: lib/personal.php:65
+#: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
 msgstr "Preferiti"
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Messaggi preferiti di %s"
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
 msgstr "Utente"
 
-#: lib/personal.php:75
+#: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
 msgstr "In arrivo"
 
-#: lib/personal.php:76
+#: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
 msgstr "I tuoi messaggi in arrivo"
 
-#: lib/personal.php:80
+#: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
 msgstr "Inviati"
 
-#: lib/personal.php:81
+#: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
 msgstr "I tuoi messaggi inviati"
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
 msgstr "Twitter"
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
 msgstr "Opzioni di integrazione Twitter"
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgid "To"
 msgstr "A"
 
-#: scripts/maildaemon.php:45
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "Could not parse message."
 msgstr "Impossibile analizzare il messaggio."
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, 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"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
+msgstr "Originale"
+
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
+msgstr "Anteprima"
+
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
+msgstr "Ritaglia"
+
+#: 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/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
+msgstr "Perso il nostro file di dati."
+
+#: actions/avatarsettings.php:334 actions/grouplogo.php:391
+#: classes/User_group.php:112
+msgid "Lost our file."
+msgstr "Perso il nostro file."
+
+#  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/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Nessun profilo specificato."
+
+#: 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/block.php:111
+msgid "Block user"
+msgstr "Blocca utente"
+
+#: actions/block.php:129
+msgid "Are you sure you want to block this user? "
+msgstr "Vuoi veramente bloccare questo utente? "
+
+#: actions/block.php:162
+msgid "You have already blocked this user."
+msgstr "Hai già bloccato questo utente."
+
+#: actions/block.php:167
+msgid "Failed to save block information."
+msgstr "Salvataggio delle informazioni per il blocco non riuscito."
+
+#: actions/confirmaddress.php:159
+#, fuzzy, php-format
+msgid "The address \"%s\" has been "
+msgstr "L'indirizzo \"%s\" è stato "
+
+#: actions/deletenotice.php:73
+msgid "You are about to permanently delete a notice. "
+msgstr "Stai per eliminare definitivamente un messaggio. "
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Aggiungi ai preferiti"
+
+#: actions/editgroup.php:54
+#, php-format
+msgid "Edit %s group"
+msgstr "Modifica il gruppo %s"
+
+#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
+#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#, fuzzy
+msgid "Inboxes must be enabled for groups to work"
+msgstr "La casella della posta in arrivo deve essere abilitata per funzionare"
+
+#: 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/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/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/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/editgroup.php:157
+msgid "Use this form to edit the group."
+msgstr "Usa questo modulo per modificare il gruppo."
+
+#: 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/editgroup.php:198 actions/newgroup.php:149
+msgid "description is too long (max 140 chars)."
+msgstr "La descrizione è troppo lunga (max 140 caratteri)."
+
+#: actions/editgroup.php:218
+msgid "Could not update group."
+msgstr "Impossibile aggiornare il gruppo."
+
+#: actions/editgroup.php:226
+msgid "Options saved."
+msgstr "Opzioni salvate."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Attesa la conferma per questo indirizzo. "
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#, fuzzy
+msgid "Make a new email address for posting to; "
+msgstr "Crea un nuovo indirizzo email per inviare messaggi; "
+
+#: actions/emailsettings.php:157
+#, fuzzy
+msgid "Send me email when someone "
+msgstr "Inviami un'email quando qualcuno "
+
+# 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/emailsettings.php:321
+#, 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. "
+
+#: actions/facebookhome.php:110
+msgid "Server error - couldn't get user!"
+msgstr "Errore del server: impossibile recuperare l'utente."
+
+#: 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/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/facebookhome.php:218
+#, fuzzy
+msgid "Skip"
+msgstr "Salta"
+
+#: actions/facebookhome.php:235
+msgid "No notice content!"
+msgstr "Nessun contenuto!"
+
+#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#, fuzzy
+msgid "Pagination"
+msgstr "Paginazione"
+
+#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+msgid "After"
+msgstr "Successivi"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+msgid "Before"
+msgstr "Precedenti"
+
+#: 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/facebookinvite.php:72
+#, fuzzy
+msgid "Invitations have been sent to the following users:"
+msgstr "Gli inviti sono stati inviati ai seguenti utenti:"
+
+#: actions/facebookinvite.php:96
+#, fuzzy, php-format
+msgid "You have been invited to %s"
+msgstr "Hai un invito per %s"
+
+#: actions/facebookinvite.php:105
+#, php-format
+msgid "Invite your friends to use %s"
+msgstr "Invita i tuoi amici a usare %s"
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
+msgstr "Amici che già usano %s:"
+
+#: actions/facebookinvite.php:130
+#, php-format
+#, fuzzy
+msgid "Send invitations"
+msgstr "Invia"
+
+#: actions/facebookremove.php:56
+msgid "Couldn't remove Facebook user."
+msgstr "Impossibile rimuovere l'utente Facebook."
+
+#: actions/facebooksettings.php:65
+#, fuzzy
+msgid "There was a problem saving your sync preferences!"
+msgstr "C'è stato un problema nel salvare le preferenze di sincronizzazione."
+
+#: actions/facebooksettings.php:67
+#, fuzzy
+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
+#, fuzzy
+msgid "A string to prefix notices with."
+msgstr "Una stringa con cui iniziare i messaggi."
+
+#: actions/facebooksettings.php:124
+#, php-format
+#, fuzzy
+msgid "If you would like %s to automatically update "
+msgstr "Se vuoi che %s aggiorni automaticamente "
+
+#: actions/facebooksettings.php:147
+#, fuzzy
+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"
+
+# prova per 'famosi', al massimo si cambia
+#: actions/favorited.php:67
+#, 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"
+
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Utenti in evidenza, pagina %d"
+
+#: actions/featured.php:99
+#, php-format
+#, fuzzy
+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"
+
+#: 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/grouplogo.php:448
+msgid "Logo updated."
+msgstr "Logo aggiornato."
+
+#: actions/grouplogo.php:450
+msgid "Failed updating logo."
+msgstr "Errore nell'aggiornare il logo."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr "Membri del gruppo %s"
+
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "Membri del gruppo %s, pagina %d"
+
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "Un elenco degli utenti in questo gruppo."
+
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
+msgstr "Gruppi"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Gruppi, pagina %d"
+
+#: actions/groups.php:90
+#, php-format
+#, 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
+#, fuzzy, 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"
+
+#: actions/imsettings.php:70
+#, fuzzy
+msgid "You can send and receive notices through "
+msgstr "Puoi inviare e ricevere messaggi attraverso "
+
+#: actions/imsettings.php:120
+#, php-format
+#, fuzzy
+msgid "Jabber or GTalk address, "
+msgstr "Indirizzo Jabber o GTalk, "
+
+#: actions/imsettings.php:147
+msgid "Send me replies through Jabber/GTalk "
+msgstr "Inviami le risposte via Jabber/GTalk "
+
+#: actions/imsettings.php:321
+#, php-format
+msgid "A confirmation code was sent "
+msgstr "Un codice di conferma è stato inviato "
+
+#: 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/joingroup.php:95
+msgid "You are already a member of that group"
+msgstr "Sei già un membro di quel gruppo"
+
+#: actions/joingroup.php:128
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Impossibile iscrivere l'utente %s al gruppo %s"
+
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
+msgstr "%s si è iscritto al gruppo %s"
+
+#: actions/leavegroup.php:60
+#, fuzzy
+msgid "Inboxes must be enabled for groups to work."
+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
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "Impossibile trovare il record della membership."
+
+#: actions/leavegroup.php:138
+#, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Impossibile rimuovere l'utente %s dal gruppo %s"
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr "%s ha lasciato il gruppo %s"
+
+#: actions/login.php:225 lib/facebookaction.php:304
+#, fuzzy
+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
+#, fuzzy
+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."
+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/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Modifica la tua password."
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "Cambio password"
+
+#: actions/peopletag.php:35
+#, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Non è un'etichetta valida di persona: %s"
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr "Utenti auto-etichettati con %s - pagina %d"
+
+#: actions/peopletag.php:91
+#, 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
+#, fuzzy
+msgid "Profile information"
+msgstr "Informazioni sul profilo"
+
+#: actions/profilesettings.php:124
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+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
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+"Questo è %%site.name%%, un servizio di [micro-"
+"blog](http://it.wikipedia.org/wiki/Microblogging) "
+
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Cloud 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
+#, fuzzy
+msgid "Tag cloud"
+msgstr "Cloud 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 "Descriviti assieme ai 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
+#, php-format
+msgid "Replies to %s, page %d"
+msgstr "Risposte a %s, pagina %d"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
+msgstr "Messaggi preferiti di %s, pagina %d"
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr "Gruppi di %s"
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+msgstr "Gruppi di %s, pagina %d"
+
+#: actions/showgroup.php:206
+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
+msgid "URL"
+msgstr "URL"
+
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#, fuzzy
+msgid "Note"
+msgstr "Note"
+
+#: actions/showgroup.php:270
+#, fuzzy
+msgid "Group actions"
+msgstr "Azioni dei gruppi"
+
+#: actions/showgroup.php:323
+#, php-format
+msgid "Notice feed for %s group"
+msgstr "Feed dei messaggi per il gruppo %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+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
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr "(nessuno)"
+
+#: actions/showgroup.php:370
+msgid "All members"
+msgstr "Tutti i membri"
+
+#: 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 "
+msgstr ""
+"**%s** è un gruppo su %%%%site.name%%%%, un servizio di [micro-"
+"blog](http://it.wikipedia.org/wiki/Microblogging) "
+
+#: actions/showmessage.php:98
+#, fuzzy
+msgid "Only the sender and recipient "
+msgstr "Solo mittente e destinatario "
+
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
+msgstr "%s, pagina %d"
+
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Profilo"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+msgid "User profile"
+msgstr "Profilo utente"
+
+#: actions/showstream.php:240 actions/tagother.php:81
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografia"
+
+#: actions/showstream.php:317
+#, fuzzy
+msgid "User actions"
+msgstr "Azioni utente"
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr "Invia un messaggio diretto a questo utente"
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr "Messaggio"
+
+#: actions/showstream.php:451
+msgid "All subscribers"
+msgstr "Tutti gli abbonati"
+
+#: actions/showstream.php:533
+msgid "All groups"
+msgstr "Tutti i gruppi"
+
+#: 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 "
+msgstr ""
+"**%s** ha un account su %%%%site.name%%%%, un servizio di [micro-"
+"blog](http://it.wikipedia.org/wiki/Microblogging) "
+
+#: actions/smssettings.php:128
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, "
+msgstr "Numero di telefono, senza punteggiatura o spazi, "
+
+#: actions/smssettings.php:162
+#, fuzzy
+msgid "Send me notices through SMS; "
+msgstr "Inviami le notifiche via SMS; "
+
+#: 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:453
+msgid "Mobile carrier"
+msgstr "Operatore telefonico"
+
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+msgstr "Non sei abbonato a quel profilo."
+
+#: actions/subedit.php:83
+msgid "Could not save subscription."
+msgstr "Impossibile salvare l'abbonamento."
+
+#: actions/subscribe.php:55
+msgid "Not a local user."
+msgstr "Non un utente locale."
+
+#: actions/subscribe.php:69
+msgid "Subscribed"
+msgstr "Abbonato"
+
+#: actions/subscribers.php:50
+#, php-format
+msgid "%s subscribers"
+msgstr "Abbonati a %s"
+
+#: actions/subscribers.php:52
+#, php-format
+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 "
+
+#: actions/subscribers.php:67
+#, fuzzy, php-format
+msgid "These are the people who "
+msgstr "Queste sono le persone che "
+
+#: actions/subscriptions.php:52
+#, php-format
+msgid "%s subscriptions"
+msgstr "Abbonamenti di %s"
+
+#: actions/subscriptions.php:54
+#, php-format
+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 "
+
+#: actions/subscriptions.php:69
+#, fuzzy, php-format
+msgid "These are the people whose "
+msgstr "Queste sono le persone i cui "
+
+#: actions/subscriptions.php:122
+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/tagother.php:33
+msgid "Not logged in"
+msgstr "Non connesso"
+
+#: actions/tagother.php:39
+msgid "No id argument."
+msgstr "Nessun argomento ID."
+
+#: actions/tagother.php:65
+#, php-format
+msgid "Tag %s"
+msgstr "Etichetta %s"
+
+#: actions/tagother.php:141
+#, fuzzy
+msgid "Tag user"
+msgstr "Etichette utente"
+
+#: actions/tagother.php:149
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+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
+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
+msgid "Could not save tags."
+msgstr "Impossibile salvare le etichette."
+
+#: actions/tagother.php:233
+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/tagrss.php:35
+msgid "No such tag."
+msgstr "Nessuna tale etichetta."
+
+#: actions/tagrss.php:66
+#, php-format
+msgid "Microblog tagged with %s"
+msgstr "Micro-blog etichettati con %s"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr "Blocco dell'utente non riuscito."
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr "Sblocco dell'utente non riuscito."
+
+#: actions/twitapiusers.php:48
+msgid "Not found."
+msgstr "Non trovato"
+
+#: actions/twittersettings.php:71
+#, fuzzy
+msgid "Add your Twitter account to automatically send "
+msgstr "Aggiungi il tuo account Twitter per inviare automaticamente "
+
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
+msgstr "Nome utente di Twitter"
+
+#: actions/twittersettings.php:126
+msgid "Twitter password"
+msgstr "Password di Twitter"
+
+# elenca quali sono i propri amici su twitter
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
+msgstr "Amici su Twitter"
+
+#: actions/twittersettings.php:327
+#, fuzzy
+msgid "Username must have only numbers, "
+msgstr "Il nome utente deve avere solo numeri, "
+
+#: actions/twittersettings.php:341
+#, fuzzy, php-format
+msgid "Unable to retrieve account information "
+msgstr "Impossibile recuperare informazioni sull'account "
+
+#: actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Errore nel rimuovere il blocco."
+
+#: actions/unsubscribe.php:50
+msgid "No profile id in request."
+msgstr "Nessun ID di profilo nella richiesta."
+
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
+msgstr "Nessun profilo con quel ID."
+
+#: actions/unsubscribe.php:71
+msgid "Unsubscribed"
+msgstr "Annullato abbonamento"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
+msgstr "Gruppi di %s"
+
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
+msgstr "Gruppi di %s, pagina %d"
+
+#: classes/Notice.php:104
+msgid "Problem saving notice. Unknown user."
+msgstr "Problema nel salvare il messaggio. Utente sconosciuto."
+
+#: classes/Notice.php:109
+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
+msgid "You are banned from posting notices on this site."
+msgstr "Ti è proibito inviare messaggi su questo sito."
+
+#: lib/accountsettingsaction.php:108
+msgid "Upload an avatar"
+msgstr "Carica un'immagine"
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr "Altro"
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr "Altre opzioni"
+
+#: lib/action.php:130
+#, php-format
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr "Pagina senza nome"
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr "Esplorazione sito primaria"
+
+#: lib/action.php:322
+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
+msgid "Account"
+msgstr "Account"
+
+#: lib/action.php:328
+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:332
+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
+msgid "Create an account"
+msgstr "Crea un account"
+
+#: lib/action.php:341
+msgid "Login with OpenID"
+msgstr "Accedi con OpenID"
+
+#: lib/action.php:344
+msgid "Help me!"
+msgstr "Aiutami!"
+
+#: lib/action.php:362
+msgid "Site notice"
+msgstr "Messaggio del sito"
+
+#: lib/action.php:417
+#, fuzzy
+msgid "Local views"
+msgstr "Viste locali"
+
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "Pagina messaggio"
+
+#: lib/action.php:562
+msgid "Secondary site navigation"
+msgstr "Esplorazione secondaria del sito"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr "Licenza del software laconica"
+
+#: lib/action.php:630
+msgid "All "
+msgstr "Tutto "
+
+#: lib/action.php:635
+msgid "license."
+msgstr "licenza."
+
+#: lib/blockform.php:123 lib/blockform.php:153
+msgid "Block this user"
+msgstr "Blocca questo utente"
+
+# azione
+#: lib/blockform.php:153
+msgid "Block"
+msgstr "Blocca"
+
+# è un suggerimento
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Togli questa nota dai preferiti"
+
+#: lib/facebookaction.php:268
+#, php-format
+msgid "To use the %s Facebook Application you need to login "
+msgstr ""
+"Per utilizzare l'applicazione Facebook %s è necessario eseguire l'accesso "
+
+#: lib/facebookaction.php:271
+#, fuzzy
+msgid " a new account."
+msgstr " un nuovo account."
+
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+msgid "Published"
+msgstr "Pubblicato"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+msgid "Favor this notice"
+msgstr "Rendi questo messaggio un favorito"
+
+#: lib/feedlist.php:64
+#, fuzzy
+msgid "Export data"
+msgstr "Esporta dai"
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr "Filtra etichette"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr "Tutto"
+
+#: lib/galleryaction.php:137
+msgid "Tag"
+msgstr "Etichetta"
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr "Scegli un'etichetta per ridurre l'elenco"
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr "Vai"
+
+#: lib/groupeditform.php:148
+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"
+
+# per renderla 'asessuale' il più possibile...
+#: lib/groupeditform.php:153
+msgid "Describe the group or topic in 140 chars"
+msgstr "Descrivi il gruppo o l'argomento in 140 caratteri"
+
+#: lib/groupeditform.php:158
+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
+msgid "Group"
+msgstr "Gruppo"
+
+# potrebbe essere lunga...
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr "Amministra"
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr "Modifica le proprietà del gruppo %s"
+
+#: lib/groupnav.php:106
+msgid "Logo"
+msgstr "Logo"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+msgstr "Aggiungi o modifica il logo di %s"
+
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
+msgstr "I gruppi più numerosi"
+
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr "I gruppi con più messaggi"
+
+#: lib/grouptagcloudsection.php:56
+#, php-format
+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 "
+
+# è relativo ai gruppi
+#: lib/joinform.php:114
+msgid "Join"
+msgstr "Iscriviti"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Lascia"
+
+#: lib/logingroupnav.php:76
+msgid "Login with a username and password"
+msgstr "Accedi con nome utente e password"
+
+#: lib/logingroupnav.php:79
+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/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+"Ehi, %s\n"
+"\n"
+
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s sta ora seguendo "
+
+#: lib/mail.php:254
+#, php-format
+msgid "Location: %s\n"
+msgstr "Ubicazione: %s\n"
+
+#: lib/mail.php:256
+#, php-format
+msgid "Homepage: %s\n"
+msgstr "Pagina web: %s\n"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+"Biografia: %s\n"
+"\n"
+
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr "%s ti ha richiamato"
+
+#: lib/mail.php:465
+#, fuzzy, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr "%1$s (%2$s) si chiede cosa tu "
+
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s ha appena aggiunto il tuo messaggio da %2$s"
+
+# è 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/messageform.php:110
+msgid "Send a direct notice"
+msgstr "Invia un messaggio diretto"
+
+#: lib/noticeform.php:125
+msgid "Send a notice"
+msgstr "Invia un messaggio"
+
+#: lib/noticeform.php:152
+msgid "Available characters"
+msgstr "Caratteri disponibili"
+
+#: lib/noticelist.php:426
+msgid "in reply to"
+msgstr "in risposta a"
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
+msgstr "Rispondi a questo messaggio"
+
+#: lib/noticelist.php:451
+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"
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr "Richiama"
+
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr "Invia un richiamo a questo utente"
+
+#: 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/publicgroupnav.php:76
+msgid "Public"
+msgstr "Pubblico"
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr "Gruppi dell'utente"
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
+msgstr "Etichette recenti"
+
+#: lib/publicgroupnav.php:86
+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
+msgid "Popular"
+msgstr "Famosi"
+
+#: lib/searchgroupnav.php:82
+msgid "Notice"
+msgstr "Messaggio"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr "Ricerca gruppi in questo sito"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr "Sezione senza nome"
+
+#: lib/subgroupnav.php:81
+#, php-format
+msgid "People %s subscribes to"
+msgstr "Persone a cui %s è abbonato"
+
+#: lib/subgroupnav.php:89
+#, php-format
+msgid "People subscribed to %s"
+msgstr "Persone abbonate a %s"
+
+#: lib/subgroupnav.php:97
+#, 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/subs.php:53
+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/tagcloudsection.php:56
+msgid "None"
+msgstr "Nessuno"
+
+#: lib/topposterssection.php:74
+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."
+
+#~ msgid "Export and delete your user information."
+#~ msgstr "Esporta ed elimina le tue informazioni personali."
+
+#~ msgid "Delete my account"
+#~ msgstr "Elimina il mio account"
+
+#~ msgid "Delete my account confirmation"
+#~ msgstr "Conferma l'eliminazione dell'account"
+
+#~ msgid "Check if you are sure you want to delete your account."
+#~ msgstr "Seleziona per eliminare veramente il tuo account."
+
+# messa così perché è una descrizione della pagina, compare in alto
+#~ msgid "Showing recently popular notices"
+#~ msgstr "Ecco i messaggi più famosi"
+
+#~ msgid "Tag a person"
+#~ msgstr "Etichetta una persona"
+
+#~ msgid "List"
+#~ msgstr "Elenco"
+
+#~ msgid "Icons"
+#~ msgstr "Icone"
+
+#~ 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"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Impossibile confermare l'email."
+
+#~ msgid "Email address"
+#~ msgstr "Indirizzo email"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Errore nell'inserire un messaggio"
+
+#~ 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."
diff --git a/locale/ja_JP/LC_MESSAGES/laconica.mo b/locale/ja_JP/LC_MESSAGES/laconica.mo
index 8dbab6632..136a73c49 100644
--- a/locale/ja_JP/LC_MESSAGES/laconica.mo
+++ b/locale/ja_JP/LC_MESSAGES/laconica.mo
diff --git a/locale/ja_JP/LC_MESSAGES/laconica.po b/locale/ja_JP/LC_MESSAGES/laconica.po
index 835b9941c..98fe89ac0 100644
--- a/locale/ja_JP/LC_MESSAGES/laconica.po
+++ b/locale/ja_JP/LC_MESSAGES/laconica.po
@@ -10,47 +10,85 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Toshiya TSURU <turutosiya@gmail.com>\n"
-"Language-Team: Japanese <turutosiya+laconica@gmail.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 7bit\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-01-26 15:04+0000\n"
+"Last-Translator: JaeHo Choi <sayhi2choi@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../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:193
+#: ../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."
+" except this private data: password, email address, IM address, phone number."
 msgstr "個人情報を除�:パスワード�メールアドレス�IMアドレス�電話番�"
 
-#: ../actions/subscribe.php:84
+#: ../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 ""
+
+#: ../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/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s � %2$s �����通知を������。"
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -59,439 +97,871 @@ msgid ""
 "\n"
 "Faithfully yours,\n"
 "%4$s.\n"
-msgstr "%1$s � %2$s �����通知を������。\n\n\t%3$s\n\n確������,\n%4$s.\n"
+msgstr ""
+"%1$s � %2$s �����通知を������。\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"確������,\n"
+"%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../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 "%1$ �ステータス %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../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 ""
+
+#: ../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:70 ../lib/stream.php:45
+#: ../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 & �も��"
 
-#: ../lib/util.php:233
+#: ../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
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
 #, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
-"**%%site.name%%** � [%%site.broughtby%%](%%site.broughtbyurl%%) "
-"��供�るマイクロブロギングサービス��。 "
 
-#: ../lib/util.php:235
+#: ../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%%** � [%%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:250
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr "コントリビューター�ニック�ーム�フル�ーム�記載�れ����。"
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: 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/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
 msgstr "6文字以上"
 
-#: ../actions/recoverpassword.php:165
+#: ../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/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
-msgstr "確�用コードを入力�れ�IMアドレス��信����。メッセージを確��る���%sを承���下��。"
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"確�用コードを入力�れ�IMアドレス��信����。メッセージを確��る���%"
+"sを承���下��。"
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55 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 ""
 
-#: ../lib/util.php:296
+#: ../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 ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
 msgstr "About"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "承�"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "OpenIDを追加"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92
 msgid "Address"
 msgstr "�所"
 
-#: ../actions/showstream.php:254
+#: ../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:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
 #, php-format
 msgid "All updates for %s"
 msgstr "%s�全��サブスクリプション"
 
-#: ../actions/noticesearchrss.php:66
+#: ../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:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "既�購読�����。"
 
-#: ../actions/userauthorization.php:76
+#: ../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:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "将�的���共用PC��自動ログイン"
 
-#: ../actions/avatar.php:32
+#: ../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/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "ア�ター�更新�れ���。"
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
-msgstr "��アドレス�確�待���。Jabber/Gtalk �メッセージを確���下��。（%s を追加������？）"
+msgstr ""
+"��アドレス�確�待���。Jabber/Gtalk �メッセージを確���下��。（%s "
+"を追加������？）"
 
-#: ../lib/util.php:1136
+#: ../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
+#, fuzzy
 msgid "Before »"
 msgstr "� >>"
 
-#: ../actions/profilesettings.php:52
+#: ../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:93 ../actions/updateprofile.php:102
+#: ../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/updateprofile.php:118
+#: ../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:261
+#: ../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/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: 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:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "OpenID consumer object を生�����ん。"
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
 msgid "Cannot normalize that Jabber ID"
 msgstr "�� Jabbar ID を正�化����ん"
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "変更"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "パスワード�変更"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../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:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "アドレス�確�"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "確�作業�キャンセル�れ���。"
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "確�コード�見��り��ん。"
 
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "接続"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "既存�アカウント�接続"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "コンタクト"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "OpenIDを作�����ん : %s"
 
-#: ../lib/openid.php:160
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow 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:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166
 msgid "Could not save avatar info"
 msgstr "ア�ターを�存����ん"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159
 msgid "Could not save new profile info"
 msgstr "新��プロファイルを�存����ん"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-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/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "サブスクリプションを作�����ん"
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: actions/confirmaddress.php:126 actions/emailsettings.php:375
+#: actions/imsettings.php:357 actions/smssettings.php:370
 msgid "Couldn't delete email confirmation."
 msgstr "メール承�を削除����ん"
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
 msgstr "サブスクリプションを削除����ん"
 
-#: ../actions/remotesubscribe.php:125
+#: ../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."
 msgstr "リクエストトークンを�得����ん"
 
-#: ../actions/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: 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:175
+#: ../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/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "作�"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "アカウントを作�"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../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:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "確��れ�最新�　Jabber/GTakk アドレス"
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../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 "最新"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %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/profilesettings.php:54
+#: ../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:181
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "メール"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-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/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
 msgid "Email address already exists."
 msgstr "メールアドレス�既�存在���。"
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
 msgstr "メールアドレス確�"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../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/userauthorization.php:136
+#: ../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:282
+#: ../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: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/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "通知追加エラー"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
 msgid "Error inserting remote profile"
 msgstr "リモートプロファイル追加エラー"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
 msgstr "アドレス確��存エラー"
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
 msgid "Error saving remote profile"
 msgstr "リモートプロファイル�存エラー"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../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:237 lib/openid.php:246
 msgid "Error saving the user."
 msgstr "ユーザ�存エラー"
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164
 msgid "Error saving user; invalid."
 msgstr "ユーザ�存エラー; �正�ユーザ"
 
-#: ../actions/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 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: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:79
+#: ../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:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "既�存在�るニック�ーム"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "よ��る質�"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "ア�ター�更新�失敗����。"
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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:61 ../actions/repliesrss.php:80
+#: ../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/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, 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
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
-msgstr "セキュリティー上��由�より�設定を変更�る��ユーザ��パスワードを入力��下��。"
+msgstr ""
+"セキュリティー上��由�より�設定を変更�る��ユーザ��パスワードを入力�"
+"�下��。"
 
-#: ../actions/profilesettings.php:44
+#: ../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:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "ホーム"
 
-#: ../actions/profilesettings.php:49
+#: ../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:87
+#: ../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/imsettings.php:61
+#: ../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 "IMアドレス"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "IM設定"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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�関連付��下��。"
+msgstr ""
+"既�アカウントを����場���ユーザ��パスワード�ログイン��OpenID�関"
+"連付��下��。"
 
 #: ../actions/openidsettings.php:45
 msgid ""
@@ -499,518 +969,922 @@ msgid ""
 "click \"Add\"."
 msgstr "OpenIDを追加�る場��下�ボックス��る\"Add\"を�リック��下��。"
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
-msgstr "パスワードを忘れ�場��登録�れ�アドレス�新��も�を���る�������。"
+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/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153
 msgid "Incorrect old password"
 msgstr "��パスワード�間������。"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
 msgid "Incorrect username or password."
 msgstr "ユーザ����パスワード�間������。"
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "登録�れ�メールアドレス�パスワード�回復方法を���り����。"
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "�正�ア�ターURL '%s'"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "�正�ホームページ '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../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:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
 msgid "Invalid notice content"
 msgstr "�正�通知内容"
 
-#: ../actions/postnotice.php:67
+#: ../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:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "�正�通知url"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "�正�プロファイルURL '%s'。"
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135
 msgid "Invalid profile URL (bad format)"
 msgstr "�正�プロファイルURL。（形��備）"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
 msgstr "�正�プロファイルURL�サー��ら返�れ���。"
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "�正�サイズ。"
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
 msgid "Invalid username or password."
 msgstr "�正�ユーザ����パスワード。"
 
-#: ../lib/util.php:237
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"マイクロブロギングソフト [Laconica](http://laconi.ca/) , "
-"�ージョン %s �動�����。 ライセンス [GNU Affero "
-"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)。"
+"マイクロブロギングソフト [Laconica](http://laconi.ca/) , �ージョン %s �動�"
+"����。 ライセンス [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)。"
 
-#: ../actions/imsettings.php:164
+#: ../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:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
-"\"UserName@example.org\" ���� Jabber ��� GTalk "
-"�アドレス。���%s をIMクライアントやGTalk�追加��下��。"
+"\"UserName@example.org\" ���� Jabber ��� GTalk �アドレス。���%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 ""
 
-#: ../actions/profilesettings.php:55
+#: ../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:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "[OpenID](%%doc.openid%%) �ログイン。"
 
-#: ../actions/login.php:122 ../actions/login.php:126
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "ログアウト"
 
-#: ../actions/login.php:106
+#: ../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 "パスワードを紛失�忘れ�？"
 
-#: ../actions/showstream.php:281
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php: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 "�ら�メン�ー"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "マイクロブログ by %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/finishopenidlogin.php:107 actions/register.php:429
 msgid "My text and files are available under "
 msgstr "�下�テキスト��ファイルを利用�能"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../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 ""
+
+#: ../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:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "新��通知"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "新��パスワード��存��功����。ログイン�����。"
 
-#: ../actions/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../actions/login.php:101 ../actions/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:99
-#: ../actions/register.php:59
+#: ../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:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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 "ニック�ーム����文字アルファベット�数字��使用����。スペース�使用����ん。"
+msgstr ""
+"ニック�ーム����文字アルファベット�数字��使用����。スペース�使用"
+"����ん。"
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
 msgstr "��ニック�ーム�使用����ん。"
 
-#: ../actions/remotesubscribe.php:72
+#: ../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:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "ニック�ーム���メールアドレス"
 
-#: ../actions/imsettings.php:147
+#: ../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 "Jabbar ID ��り��ん。"
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "�証�リクエスト��り��ん。"
 
-#: ../actions/confirmaddress.php:33
+#: ../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:49
+#: ../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/userbyid.php:27
+#: ../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:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
 msgstr "ニック�ーム��り��ん。"
 
-#: ../actions/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: 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:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+#: actions/recoverpassword.php:266
 msgid "No registered email address for that user."
 msgstr "��ユーザ��メールアドレス�登録��り��ん。"
 
-#: ../actions/userauthorization.php:48
+#: ../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:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "サイズ��り��ん。"
 
-#: ../actions/openidsettings.php:135
+#: ../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/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+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 "��よ��OpenID��り��ん。"
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "��よ��ドキュメント��り��ん。"
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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:56
+#: actions/recoverpassword.php:62
 msgid "No such recovery code."
 msgstr "��よ��回復コード��り��ん。"
 
-#: ../actions/postnotice.php:56
+#: ../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:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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 "��よ��ユーザ����ん。"
 
-#: ../lib/gallery.php:76
+#: ../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:60
+#: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr "回復コード���り��ん。"
 
-#: ../actions/imsettings.php:158
+#: ../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:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "有効� OpenID ���り��ん。"
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../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:83 ../actions/register.php:61
+#: ../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:118
+#: ../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:111
+#: ../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: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/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
 msgstr "画������ファイル�破������。"
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "�証�れ����ん。"
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "想定外�レス�ンス���"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/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/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "購読�����ん�"
 
-#: ../actions/showstream.php:82
+#: ../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:39
+#: actions/shownotice.php:94
 msgid "Notice has no profile"
 msgstr "通知��プロファイル��り��ん。"
 
-#: ../actions/showstream.php:297
+#: ../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/password.php:39
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "��パスワード"
 
-#: ../lib/util.php:288
+#: ../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: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:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
 msgstr "OpenID 自動�示"
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: 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:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID 障害 : %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "OpenID 設定"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "�完全�アップロード。"
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:335
 msgid "Password and confirmation do not match."
 msgstr "パスワード�確��一致���ん。"
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+#: actions/recoverpassword.php:331
 msgid "Password must be 6 chars or more."
 msgstr "パスワード�6字以上���れ�����ん。"
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
 msgid "Password recovery requested"
 msgstr "パスワード回復�リクエスト�れ���"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../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/password.php:61 ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../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"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "ピープルサー�"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "パーソナル"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/userauthorization.php:78
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
-msgstr "ユーザ�通知を購読�る��詳細を確���下��。購読���場���\"Cancel\" キャンセルをクリック��下��。"
+msgstr ""
+"ユーザ�通知を購読�る��詳細を確���下��。購読���場���\"Cancel\" "
+"キャンセルをクリック��下��。"
 
-#: ../actions/imsettings.php:74
+#: ../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/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "設定"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "設定��存�れ���。"
 
-#: ../lib/util.php:300
+#: ../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 "プライ�シー"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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/stream.php:54
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "プロファイルURL"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
 msgstr "プロファイル設定"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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 "プロファイル��明"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "パブリック"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "パブリックフィード"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "パブリックタイムライン"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr "回復"
 
-#: ../actions/recoverpassword.php:141
+#: ../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:67
+#: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr "�明�ユーザ����回復コード。"
 
-#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: actions/register.php:69 actions/register.php:436 lib/action.php:338
+#: lib/facebookaction.php:277 lib/logingroupnav.php:78
 msgid "Register"
 msgstr "登録"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "拒�"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414
 msgid "Remember me"
 msgstr "ログイン状態を��"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
 msgstr "リモートプロファイル�一致�るも���り��ん"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "リモートサブスクライブ"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "OpenID を削除"
 
@@ -1018,42 +1892,86 @@ msgstr "OpenID を削除"
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
-msgstr "最後� OpenID を削除�る��ログイン�����り���削除�る����別� OpenID を追加��下��。"
+msgstr ""
+"最後� OpenID を削除�る��ログイン�����り���削除�る����別� "
+"OpenID を追加��下��。"
 
-#: ../lib/stream.php:49
+#: ../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:50
+#: ../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:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "リセット"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "パスワードをリセット"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
 msgid "Same as password above"
 msgstr "上���パスワード"
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../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:73 ../lib/util.php:277
+#: ../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:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "ストリームフィードを検索"
 
-#: ../actions/noticesearch.php:30
+#: ../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 "
@@ -1065,148 +1983,281 @@ msgstr "%%site.name%% ã�®é€šçŸ¥ã‚’内容ã�‹ã‚‰æ¤œç´¢ã€‚検索語ã�¯ã‚¹ãƒšãƒ¼ã‚¹å
 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字以上"
+msgstr ""
+"%%site.name%% �人を���場所�興味�ら検索。検索語�スペース区切る。3字以上"
 
-#: ../lib/util.php:982
+#: ../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/imsettings.php:71
+#: ../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 ���通知を���下��。"
 
-#: ../lib/util.php:282
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr "設定"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "設定��存�れ���。"
 
-#: ../actions/finishaddopenid.php:66
+#: ../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 "�測�事態�発生����。"
 
-#: ../lib/util.php:302
+#: ../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:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "統計データ"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../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:172
-#: ../actions/showstream.php:181
+#: ../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:294 ../actions/subscribers.php:27
+#: ../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:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "購読�許�"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "購読�拒�"
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/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/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
 msgid "System error uploading file."
 msgstr "ファイル�アップロード�システムエラー"
 
-#: ../actions/noticesearch.php:34
+#: ../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: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:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "��アドレス�既�承��れ����。"
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
 msgstr "��確�コード�����も����り��ん�"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "ファイルサイズ�大�����。"
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr "�� Jabber ID �既�����も���。"
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr "�� Jabber ID �����も����り��ん。"
 
-#: ../actions/imsettings.php:201
+#: ../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/newnotice.php:52
+#: ../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/confirmaddress.php:86
+#: ../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/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "アドレス \"%s\" �����アカウント���承��れ����。"
 
-#: ../actions/imsettings.php:241
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413
 msgid "The address was removed."
 msgstr "アドレス�削除�れ���。"
 
-#: ../actions/userauthorization.php:311 ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: ../actions/userauthorization.php:321 ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "%s　�通知を����る人"
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "����通知を����る人"
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "%s �通知を����る人"
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "����通知を����る人"
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/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/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
 msgstr "確�コード������。も�一度やり直������。"
 
@@ -1214,78 +2265,158 @@ msgstr "確�コード������。も�一度やり直�����
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
-msgstr "��フォーム�自動的�サブミット�れ��。�れ��場���サブミットボタンをクリック��下��。OpenIDプロ�イダ�転��れ��。"
+msgstr ""
+"��フォーム�自動的�サブミット�れ��。�れ��場���サブミットボタンを"
+"クリック��下��。OpenIDプロ�イダ�転��れ��。"
 
-#: ../actions/finishopenidlogin.php:56
+#: ../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��関連付��必���。アカウントを新�作��る��既存�アカウント��関連付����ら�を下��。"
+"�れ� %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 ""
 
-#: ../lib/util.php:147
+#: ../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"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
-"サブスクライブ�る���[ログイン](%%action.login%%) "
-"�る�, [登録](%%action.register%%) を行��下��。既� "
-"[compatible microblogging site](%%doc.openmublog%%) �アカウントを���も��場���下�プロファイルURLを入力��下��."
+"サブスクライブ�る���[ログイン](%%action.login%%) �る�, [登録](%%action."
+"register%%) を行��下��。既� [compatible microblogging site](%%doc."
+"openmublog%%) �アカウントを���も��場���下�プロファイルURLを入力��"
+"下��."
 
-#: ../actions/profilesettings.php:51
+#: ../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:74 actions/remotesubscribe.php:83
+#: actions/remotesubscribe.php:110
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "プロファイルサービス���マイクロブロギングサービス�URL"
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/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:237
+#: ../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:245
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
-msgstr "特�断り�無�場�����サイト�コンテンツ�著作権�著作者�帰属��下記�件�下�使用�能��。"
+msgstr ""
+"特�断り�無�場�����サイト�コンテンツ�著作権�著作者�帰属��下記�"
+"件�下�使用�能��。"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "�明�アドレスタイプ %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "サブスクライブ中止"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../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/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr "サ�ート外�画�形���。"
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "アップロード"
 
@@ -1296,104 +2427,210 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"\"ア�ター\" (ユーザ�画�) をアップロード。 "
-"アップロード��後��画��編集�����ん。サイズ�大������（�������）確���下��。サイト�ライセンス��用�れ��。自身�所有�����共有���画�を使用��下��。"
+"\"ア�ター\" (ユーザ�画�) をアップロード。 アップロード��後��画��編集"
+"�����ん。サイズ�大������（�������）確���下��。サイト"
+"�ライセンス��用�れ��。自身�所有�����共有���画�を使用��下�"
+"�。"
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../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:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../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/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "ユーザ�ニック�ーム"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
 msgstr "最近�� %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../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/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "�正�画�形�。'%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "�正�画�サイズ。'%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../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/recoverpassword.php:31
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "パスワード����変更����。良�も�を�ん�下���"
 
-#: ../actions/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "アカウントを作���通知�投稿��能��。"
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr "\"削除\"をクリック�� OpenID を削除����。"
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"Jabber/GTalk [instant "
-"messages](%%doc.im%%)　経由�通知��信��信��能��。下�アドレスを設定��下��。"
+"Jabber/GTalk [instant messages](%%doc.im%%)　経由�通知��信��信��能�"
+"�。下�アドレスを設定��下��。"
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
-msgstr "����������知��もら��������プロファイル情報を更新����。"
+"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:51
+#: ../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:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67
 msgid "You did not send us that profile"
 msgstr "��プロファイル��信�れ����ん。"
 
-#: ../actions/recoverpassword.php:134
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "���� OpenID URL"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr "��サー���ニック�ーム����登録��メールアドレス。"
 
@@ -1403,1372 +2640,2203 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"[OpenID](%%doc.openid%%) "
-"を使����アカウント�様々�ウェブサイト�ログイン�る�������。���関連付�る OpenID を管���下��。"
+"[OpenID](%%doc.openid%%) を使����アカウント�様々�ウェブサイト�ログイン"
+"�る�������。���関連付�る OpenID を管���下��。"
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "数秒�"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "約 %d 日�"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "約 %d 時間�"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr "約 %d 分�"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr "約 %d ヵ月�"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "約 1 日�"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "約 1 分�"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "約 1 ヵ月�"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "約 1 年�"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "約 1 時間�"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "返信"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "上�パスワード���"
 
-#: ../lib/util.php:1127
+#: ../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 "<< �"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
+#: 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/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: 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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
+msgid "%s favorite notices"
 msgstr ""
 
-#: ../actions/invite.php:168 actions/invite.php:176
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
+msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+#: 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:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
+#: actions/login.php:122 actions/login.php:264
+msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
+#: actions/login.php:126 actions/login.php:268
+msgid "Login with your username and password. "
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
+#: 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/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
+#: 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/register.php:213
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+msgid "No such user"
 msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
+#: actions/newmessage.php:117 actions/newmessage.php:67
+msgid "New message"
 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/noticesearch.php:95 actions/noticesearch.php:146
+msgid "Notice without matching profile"
 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/openidsettings.php:28 actions/openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+#: actions/outbox.php:53 actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+"Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
+msgid "You can update your personal profile info here "
 msgstr ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
+#: 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/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+msgid "This confirmation code is too old. "
 msgstr ""
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
 msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
 msgstr ""
 
-#: ../actions/register.php:202
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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...\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."
+"want to..."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: 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 "Could not follow user: %s is already on your list."
+msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
 msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
+#: actions/showstream.php:154
+msgid "Send a message"
 msgstr ""
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, php-format
+msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#, php-format
+msgid "Direct messages to %s"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
+msgid "No message text!"
 msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
+#: 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/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
-msgid "Feed for tag %s"
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
+#: 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 ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
+#: 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 ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+msgid "Twitter settings"
 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/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+msgid "Current verified Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
 msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
 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/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
+msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+msgid "Twitter settings saved."
 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/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
+msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
+#: 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/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+msgid "Twitter preferences saved."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
+msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
+msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+msgid "Command results"
 msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
+#: classes/Command.php:96 classes/Command.php:113
+#, php-format
+msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
+msgid "User has no last notice"
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
+#: classes/Command.php:146 classes/Command.php:166
+msgid "Notice marked as fave."
 msgstr ""
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
-msgid "Notices tagged with %s"
+msgid "Homepage: %s"
 msgstr ""
 
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
 msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
+#: classes/Command.php:295 classes/Command.php:335
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: 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:28 actions/register.php:28
-msgid "Registration not allowed."
+#: classes/Command.php:313 classes/Command.php:356
+msgid "Notification off."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
+#: classes/Message.php:53 classes/Message.php:56
+msgid "Could not insert message."
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
+#: classes/Message.php:63 classes/Message.php:66
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
 msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: lib/mail.php:253 lib/mail.php:512
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: lib/mailbox.php:43 lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: lib/openid.php:195 lib/openid.php:203
+msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+msgid "Favorites"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
 msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
 msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
+msgid "Twitter"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
+msgid "Twitter integration options"
 msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+msgid "Could not parse message."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
+#: 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."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "設定"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "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 ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
 msgstr ""
 
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
+#: 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"
 msgstr ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "��よ��ユーザ����ん。"
+
+#: actions/block.php:129
+msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/block.php:162
+#, fuzzy
+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 ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
 #, php-format
-msgid "Updates from %1$s on %2$s!"
+msgid "Edit %s group"
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: 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/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: 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"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
 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/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "�イオグラフィ�長����。（最長140字）"
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "ユーザを更新����ん"
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "設定��存�れ���。"
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "確�コード�エラー��り��。"
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: 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 ""
+"確�用コードを入力�れ�IMアドレス��信����。メッセージを確��る���%"
+"sを承���下��。"
+
+#: actions/facebookhome.php:110
+msgid "Server error - couldn't get user!"
+msgstr ""
+
+#: actions/facebookhome.php:196
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "If you would like the %s app to automatically update "
 msgstr ""
 
-#: ../lib/mail.php:147
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, 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 "Allow %s to update my Facebook status"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: 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"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
+#: 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/facebookinvite.php:70
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
+#: 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:"
 msgstr ""
 
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
 msgstr ""
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
+#: 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!"
 msgstr ""
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "設定��存�れ���。"
+
+#: actions/facebooksettings.php:90
+msgid "Automatically update my Facebook status with my notices."
 msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Favor"
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "プロファイル"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
 msgstr ""
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "設定"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
+#: 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."
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/featured.php:71
 #, php-format
-msgid "%s favorite notices"
+msgid "Featured users, page %d"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/featured.php:99
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/inbox.php:28
-#, php-format
-msgid "Inbox for %s - page %d"
+#: actions/finishremotesubscribe.php:188
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/inbox.php:30
-#, php-format
-msgid "Inbox for %s"
+#: actions/groupbyid.php:79
+msgid "No ID"
 msgstr ""
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+msgid "Group logo"
 msgstr ""
 
-#: actions/invite.php:178
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "ア�ター�更新�れ���。"
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "ア�ター�更新�失敗����。"
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: actions/login.php:126
-msgid "Login with your username and password. "
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
 msgstr ""
 
-#: actions/newmessage.php:65
-msgid "No recipient specified."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
+#: actions/groups.php:90
+#, php-format
+msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: 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 ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
+"%%site.name%% �人を���場所�興味�ら検索。検索語�スペース区切る。3字以上"
 
-#: actions/newmessage.php:108
-msgid "No such user"
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "ピープルサー�"
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
 msgstr ""
 
-#: actions/newmessage.php:117
-msgid "New message"
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
 msgstr ""
 
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
+#: actions/imsettings.php:147
+#, fuzzy
+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/openidsettings.php:28
+#: actions/joingroup.php:95
+#, 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"
+
+#: actions/joingroup.php:135
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgid "%s joined group %s"
 msgstr ""
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/leavegroup.php:65
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "��よ��通知��り��ん。"
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "��プロファイル��信�れ����ん。"
+
+#: actions/leavegroup.php:100
+msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/outbox.php:28
-#, php-format
-msgid "Outbox for %s - page %d"
+#: actions/leavegroup.php:130
+msgid "Could not find membership record."
 msgstr ""
 
-#: actions/outbox.php:30
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "OpenIDを作�����ん : %s"
+
+#: actions/leavegroup.php:145
 #, php-format
-msgid "Outbox for %s"
+msgid "%s left group %s"
 msgstr ""
 
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
 msgstr ""
 
-#: actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
+#: actions/newgroup.php:177
+#, fuzzy
+msgid "Could not create group."
+msgstr "ア�ターを�存����ん"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "サブスクリプションを作�����ん"
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "ファイルサイズ�大�����。"
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "通知"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
 msgstr ""
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
+#: actions/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "OpenID ログイン"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "OpenID を削除"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "設定"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
 msgstr ""
 
-#: actions/register.php:216
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "検索"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "場所�長����。（255字��）"
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "パスワード�変更"
+
+#: actions/passwordsettings.php:89
+#, 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 ""
+
+#: actions/peopletag.php:91
 #, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "プロファイル��明"
+
+#: actions/profilesettings.php:124
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/profilesettings.php:144
+msgid "Automatically subscribe to whoever "
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: 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."
+msgstr ""
+
+#: actions/public.php:220
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
 
-#: actions/showfavorites.php:61
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "パブリックフィード"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Feed for favorites of %s"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/showmessage.php:33
-msgid "No such message."
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: 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 ""
 
-#: actions/showmessage.php:61
+#: 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"
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "140字以内�自己紹介"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "�る場所, 例�� \"City, State (or Region), Country\""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+msgstr "個人情報を除�:パスワード�メールアドレス�IMアドレス�電話番�"
+
+#: actions/register.php:471
 #, php-format
-msgid "Message to %1$s on %2$s"
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr ""
 
-#: actions/showmessage.php:66
-#, php-format
-msgid "Message from %1$s on %2$s"
+#: actions/register.php:495
+msgid "(You should receive a message by email "
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
+msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/smssettings.php:312
+#: actions/replies.php:118
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "%s ��返信"
+
+#: actions/showfavorites.php:79
 #, php-format
-msgid "Mobile carrier for your phone. "
+msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
-msgid "Direct messages to %s"
+msgid "%s group"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/showgroup.php:79
 #, php-format
-msgid "All the direct messages sent to %s"
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
+#: 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"
+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"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "%s�通知フィード"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, 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 ""
+
+#: actions/showgroup.php:370
+msgid "All members"
+msgstr ""
+
+#: actions/showgroup.php:378
 #, php-format
-msgid "All the direct messages sent from %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: 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"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "購読者"
+
+#: actions/showstream.php:533
+msgid "All groups"
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/showstream.php:542
 #, php-format
-msgid "%s / Favorites from %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+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"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: 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 "購読者"
+
+#: actions/subscribers.php:52
 #, php-format
-msgid "%s updates favorited by %s / %s."
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: 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
+#, 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　�通知を����る人"
+
+#: actions/subscriptions.php:122
+#, fuzzy
+msgid "Jabber"
+msgstr "Jabbar ID ��り��ん。"
+
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "マイクロブログ by %s"
+
+#: actions/tag.php:66
 #, php-format
-msgid "%s added your notice as a favorite"
+msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: 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 "Tag %s"
+msgstr ""
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr ""
+
+#: actions/tagother.php:149
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/tagother.php:164
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/tagother.php:191
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
+#: 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."
 msgstr ""
 
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "��よ��通知��り��ん。"
+
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "マイクロブログ by %s"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
 msgstr ""
 
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "リクエスト��り��ん�"
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "新��パスワード"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
 msgstr ""
 
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
 msgstr ""
 
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
+#: actions/twittersettings.php:341
+#, fuzzy, php-format
+msgid "Unable to retrieve account information "
+msgstr "メール承�を削除����ん"
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "ユーザ�存エラー"
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "サー��ら�供�れるプロファイルURL��り��ん。"
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "リモートプロファイル�一致�るも���り��ん"
+
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "サブスクライブ中止"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
 msgstr ""
 
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "通知を�存�る際��題�発生����。"
+
+#: classes/Notice.php:109
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+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 "Unable to retrieve account information for \"%s\" from Twitter."
+msgid "%s - %s"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
+#: lib/action.php:145
+msgid "Untitled page"
 msgstr ""
 
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
+#: lib/action.php:316
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
+#: lib/action.php:325
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "About"
+
+#: lib/action.php:328
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
+#: lib/action.php:332
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
+#: lib/action.php:335
+msgid "Login to the site"
 msgstr ""
 
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "アカウントを作�"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "��よ��OpenID��り��ん。"
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "ヘルプ"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "新��通知"
+
+#: lib/action.php:417
+msgid "Local views"
 msgstr ""
 
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "新��通知"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "サブスクリプション"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
 msgstr ""
 
-#: classes/Channel.php:113
-msgid "Command results"
+#: lib/action.php:630
+msgid "All "
 msgstr ""
 
-#: classes/Channel.php:148
-msgid "Command complete"
+#: lib/action.php:635
+msgid "license."
 msgstr ""
 
-#: classes/Channel.php:158
-msgid "Command failed"
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "��よ��ユーザ����ん。"
+
+#: lib/blockform.php:153
+msgid "Block"
 msgstr ""
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
 msgstr ""
 
-#: classes/Command.php:96
+#: lib/facebookaction.php:268
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
+#: 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/feedlist.php:64
+msgid "Export data"
 msgstr ""
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
+#: lib/galleryaction.php:121
+msgid "Filter tags"
 msgstr ""
 
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
+#: lib/galleryaction.php:131
+msgid "All"
 msgstr ""
 
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
+#: lib/galleryaction.php:137
+msgid "Tag"
 msgstr ""
 
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
+#: lib/galleryaction.php:139
+msgid "Go"
 msgstr ""
 
-#: classes/Command.php:178
-#, php-format
-msgid "About: %s"
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "ホームページ�ブログ�プロファイル���他サイト� URL"
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "サブスクリプション"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "140字以内�自己紹介"
+
+#: lib/groupeditform.php:158
+#, 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
+msgid "Group"
 msgstr ""
 
-#: classes/Command.php:200
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Edit %s group properties"
 msgstr ""
 
-#: classes/Command.php:214
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "ログアウト"
+
+#: lib/groupnav.php:107
 #, php-format
-msgid "Direct message to %s sent"
+msgid "Add or edit %s logo"
 msgstr ""
 
-#: classes/Command.php:216
-msgid "Error sending direct message."
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
 msgstr ""
 
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
 msgstr ""
 
-#: classes/Command.php:270
+#: lib/grouptagcloudsection.php:56
 #, php-format
-msgid "Subscribed to %s"
+msgid "Tags in %s group's notices"
 msgstr ""
 
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "��ページ�����承���メディアタイプ��利用����ん。"
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "ログイン"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "�存"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "�正�ユーザ����パスワード。"
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "アカウントを作�"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
 msgstr ""
 
-#: classes/Command.php:295
+#: lib/mail.php:175
 #, php-format
-msgid "Unsubscribed from %s"
+msgid ""
+"Hey, %s.\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s � %2$s �����通知を������。"
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "場所"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "ホームページ"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:313
-msgid "Notification off."
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
 msgstr ""
 
-#: classes/Command.php:315
-msgid "Can't turn off notification."
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr ""
 
-#: classes/Command.php:333
-msgid "Notification on."
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s � %2$s �����通知を������。"
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
 msgstr ""
 
-#: classes/Command.php:335
-msgid "Can't turn on notification."
+#: lib/messageform.php:110
+msgid "Send a direct notice"
 msgstr ""
 
-#: classes/Command.php:344
-msgid "Commands:\n"
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "新��通知"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6文字以上"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "...�対���返信"
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
 msgstr ""
 
-#: classes/Message.php:53
-msgid "Could not insert message."
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "返信"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+msgid "Delete this notice"
 msgstr ""
 
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
+#: lib/noticelist.php:474
+msgid "Delete"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
 msgstr ""
 
-#: lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: lib/nudgeform.php:128
+msgid "Nudge"
 msgstr ""
 
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/personaltagcloudsection.php:56
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
+#: lib/profilelist.php:182
+msgid "(none)"
 msgstr ""
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
-msgstr ""
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "パブリック"
 
-#: lib/personal.php:65
-msgid "Favorites"
+#: lib/publicgroupnav.php:80
+msgid "User groups"
 msgstr ""
 
-#: lib/personal.php:66
-#, php-format
-msgid "%s's favorite notices"
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
 msgstr ""
 
-#: lib/personal.php:66
-msgid "User"
+#: lib/publicgroupnav.php:86
+msgid "Featured"
 msgstr ""
 
-#: lib/personal.php:75
-msgid "Inbox"
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "ピープルサー�"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "通知"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
 msgstr ""
 
-#: lib/personal.php:76
-msgid "Your incoming messages"
+#: lib/section.php:89
+msgid "Untitled section"
 msgstr ""
 
-#: lib/personal.php:80
-msgid "Outbox"
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "リモートサブスクライブ"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "リモートサブスクライブ"
+
+#: lib/subgroupnav.php:97
+#, php-format
+msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/personal.php:81
-msgid "Your sent messages"
+#: lib/subgroupnav.php:104
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/settingsaction.php:99
-msgid "Twitter"
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "プロファイル��り��ん。"
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "購読�許�"
+
+#: lib/tagcloudsection.php:56
+msgid "None"
 msgstr ""
 
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
+#: lib/topposterssection.php:74
+msgid "Top posters"
 msgstr ""
 
-#: lib/util.php:1718
-msgid "To"
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "��よ��ユーザ����ん。"
+
+#: lib/unblockform.php:150
+msgid "Unblock"
 msgstr ""
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "アカウントを作�"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "メールを確�����ん"
+
+#~ msgid "Email address"
+#~ msgstr "メールアドレス"
+
+#~ msgid "Error inserting notice"
+#~ 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 ""
+#~ "パスワードを忘れ�場��登録�れ�アドレス�新��も�を���る�����"
+#~ "��。"
diff --git a/locale/ko/LC_MESSAGES/laconica.mo b/locale/ko/LC_MESSAGES/laconica.mo
deleted file mode 100644
index c97fe45df..000000000
--- a/locale/ko/LC_MESSAGES/laconica.mo
+++ /dev/null
diff --git a/locale/ko/LC_MESSAGES/laconica.po b/locale/ko/LC_MESSAGES/laconica.po
deleted file mode 100644
index 971ac3df7..000000000
--- a/locale/ko/LC_MESSAGES/laconica.po
+++ /dev/null
@@ -1,2998 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
-#: ../actions/register.php:191 actions/finishopenidlogin.php:88
-#: actions/register.php:205
-msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
-msgstr ""
-
-#: ../actions/subscribe.php:84 ../lib/mail.php:124 lib/mail.php:124
-#: lib/mail.php:126
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
-
-#: ../actions/subscribe.php:86 ../lib/mail.php:126
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
-msgstr ""
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr ""
-
-#: ../actions/publicrss.php:60 ../actions/publicrss.php:62
-#: actions/publicrss.php:48
-#, php-format
-msgid "%s Public Stream"
-msgstr ""
-
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
-#: ../actions/allrss.php:60 ../actions/twitapistatuses.php:238
-#: ../lib/stream.php:51 actions/all.php:47 actions/allrss.php:60
-#: actions/twitapistatuses.php:155 lib/personal.php:51
-#, php-format
-msgid "%s and friends"
-msgstr ""
-
-#: ../lib/util.php:233 ../lib/util.php:257 lib/util.php:273
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
-msgstr ""
-
-#: ../lib/util.php:235 ../lib/util.php:259 lib/util.php:275
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr ""
-
-#: ../lib/util.php:250 ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176 actions/finishopenidlogin.php:79
-#: actions/profilesettings.php:76
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: ../actions/password.php:42 ../actions/register.php:178
-msgid "6 or more characters"
-msgstr "6글� ��"
-
-#: ../actions/recoverpassword.php:165 ../actions/recoverpassword.php:180
-#: actions/recoverpassword.php:186
-msgid "6 or more characters, and don't forget it!"
-msgstr ""
-
-#: ../actions/imsettings.php:188 ../actions/imsettings.php:197
-#: actions/imsettings.php:205
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
-msgstr ""
-
-#: ../lib/util.php:296 ../lib/util.php:324 lib/util.php:340
-msgid "About"
-msgstr ""
-
-#: ../actions/userauthorization.php:118 ../actions/userauthorization.php:119
-#: actions/userauthorization.php:126
-msgid "Accept"
-msgstr ""
-
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/smssettings.php:71 actions/emailsettings.php:63
-#: actions/imsettings.php:64 actions/openidsettings.php:58
-#: actions/smssettings.php:71 actions/twittersettings.php:85
-msgid "Add"
-msgstr ""
-
-#: ../actions/openidsettings.php:43
-msgid "Add OpenID"
-msgstr "OpenID 추가"
-
-#: ../actions/imsettings.php:39
-msgid "Address"
-msgstr "주소"
-
-#: ../actions/showstream.php:254 ../actions/showstream.php:273
-#: actions/showstream.php:288
-msgid "All subscriptions"
-msgstr ""
-
-#: ../actions/publicrss.php:62 ../actions/publicrss.php:64
-#: actions/publicrss.php:50
-#, php-format
-msgid "All updates for %s"
-msgstr ""
-
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#, php-format
-msgid "All updates matching search term \"%s\""
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
-#: ../actions/login.php:31 ../actions/register.php:30
-#: actions/finishopenidlogin.php:29 actions/login.php:31
-#: actions/openidlogin.php:29 actions/register.php:30
-msgid "Already logged in."
-msgstr ""
-
-#: ../actions/subscribe.php:48 ../lib/subs.php:42 lib/subs.php:42
-msgid "Already subscribed!."
-msgstr ""
-
-#: ../actions/userauthorization.php:76 ../actions/userauthorization.php:77
-#: actions/userauthorization.php:83
-msgid "Authorize subscription"
-msgstr ""
-
-#: ../actions/login.php:100 ../actions/register.php:184
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-
-#: ../actions/avatar.php:32
-msgid "Avatar"
-msgstr "아바타"
-
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-msgid "Avatar updated."
-msgstr ""
-
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
-#, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
-msgstr ""
-
-#: ../lib/util.php:1136 ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
-msgstr ""
-
-#: ../actions/profilesettings.php:52 ../actions/profilesettings.php:49
-#: ../actions/register.php:170 actions/profilesettings.php:82
-#: actions/register.php:184
-msgid "Bio"
-msgstr ""
-
-#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-msgid "Bio is too long (max 140 chars)."
-msgstr ""
-
-#: ../actions/updateprofile.php:118 ../actions/updateprofile.php:119
-#: actions/updateprofile.php:120
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr ""
-
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
-#: ../actions/recoverpassword.php:300 actions/profilesettings.php:404
-#: actions/recoverpassword.php:313
-msgid "Can't save new password."
-msgstr ""
-
-#: ../actions/imsettings.php:59 ../actions/emailsettings.php:57
-#: ../actions/imsettings.php:58 ../actions/smssettings.php:62
-#: actions/emailsettings.php:58 actions/imsettings.php:59
-#: actions/smssettings.php:62
-msgid "Cancel"
-msgstr ""
-
-#: ../lib/openid.php:121 lib/openid.php:121
-msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
-
-#: ../actions/imsettings.php:154 ../actions/imsettings.php:163
-#: actions/imsettings.php:171
-msgid "Cannot normalize that Jabber ID"
-msgstr ""
-
-#: ../actions/password.php:45 actions/profilesettings.php:184
-msgid "Change"
-msgstr ""
-
-#: ../actions/password.php:32 actions/profilesettings.php:36
-msgid "Change password"
-msgstr ""
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
-#: actions/profilesettings.php:182 actions/recoverpassword.php:187
-#: actions/register.php:169 actions/smssettings.php:65
-msgid "Confirm"
-msgstr ""
-
-#: ../actions/confirmaddress.php:84 ../actions/confirmaddress.php:90
-#: actions/confirmaddress.php:90
-msgid "Confirm Address"
-msgstr ""
-
-#: ../actions/imsettings.php:213 ../actions/emailsettings.php:238
-#: ../actions/imsettings.php:222 ../actions/smssettings.php:245
-#: actions/emailsettings.php:256 actions/imsettings.php:230
-#: actions/smssettings.php:253
-msgid "Confirmation cancelled."
-msgstr ""
-
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-msgid "Confirmation code not found."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-msgid "Connect"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-msgid "Connect existing account"
-msgstr ""
-
-#: ../lib/util.php:304 ../lib/util.php:332 lib/util.php:348
-msgid "Contact"
-msgstr ""
-
-#: ../lib/openid.php:178 lib/openid.php:178
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr ""
-
-#: ../lib/openid.php:160 lib/openid.php:160
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr ""
-
-#: ../actions/updateprofile.php:161 ../actions/updateprofile.php:162
-#: actions/updateprofile.php:163
-msgid "Could not save avatar info"
-msgstr ""
-
-#: ../actions/updateprofile.php:154 ../actions/updateprofile.php:155
-#: actions/updateprofile.php:156
-msgid "Could not save new profile info"
-msgstr ""
-
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
-msgid "Couldn't convert request tokens to access tokens."
-msgstr ""
-
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr ""
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
-#: actions/confirmaddress.php:84 actions/emailsettings.php:252
-#: actions/imsettings.php:226 actions/smssettings.php:249
-msgid "Couldn't delete email confirmation."
-msgstr ""
-
-#: ../actions/unsubscribe.php:56 ../lib/subs.php:103 lib/subs.php:116
-msgid "Couldn't delete subscription."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
-msgid "Couldn't get a request token."
-msgstr ""
-
-#: ../actions/imsettings.php:178 ../actions/emailsettings.php:205
-#: ../actions/imsettings.php:187 ../actions/smssettings.php:206
-#: actions/emailsettings.php:223 actions/imsettings.php:195
-#: actions/smssettings.php:214
-msgid "Couldn't insert confirmation code."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
-msgid "Couldn't insert new subscription."
-msgstr ""
-
-#: ../actions/profilesettings.php:175 ../actions/profilesettings.php:184
-#: ../actions/twitapiaccount.php:96 actions/profilesettings.php:299
-#: actions/twitapiaccount.php:94
-msgid "Couldn't save profile."
-msgstr ""
-
-#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
-#: actions/confirmaddress.php:72 actions/emailsettings.php:174
-#: actions/emailsettings.php:277 actions/imsettings.php:146
-#: actions/imsettings.php:251 actions/profilesettings.php:256
-#: actions/smssettings.php:165 actions/smssettings.php:277
-msgid "Couldn't update user."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-msgid "Create"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-msgid "Create a new user with this nickname."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-msgid "Create new account"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-msgid "Creating new account for OpenID that already has a user."
-msgstr ""
-
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-msgid "Current confirmed Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/showstream.php:337 ../actions/showstream.php:356
-#: actions/showstream.php:367
-msgid "Currently"
-msgstr ""
-
-#: ../lib/util.php:893 ../lib/util.php:1061 lib/util.php:1110
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
-
-#: ../actions/profilesettings.php:54 ../actions/profilesettings.php:51
-#: ../actions/register.php:172 actions/profilesettings.php:84
-#: actions/register.php:186
-msgid "Describe yourself and your interests in 140 chars"
-msgstr ""
-
-#: ../actions/register.php:181
-msgid "Email"
-msgstr "�메�"
-
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "�메� 주소"
-
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
-#: ../actions/register.php:73 actions/register.php:80
-msgid "Email address already exists."
-msgstr ""
-
-#: ../lib/mail.php:82 ../lib/mail.php:90 lib/mail.php:90
-msgid "Email address confirmation"
-msgstr ""
-
-#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
-#: actions/recoverpassword.php:197
-msgid "Enter a nickname or email address."
-msgstr ""
-
-#: ../actions/userauthorization.php:136 ../actions/userauthorization.php:137
-#: actions/userauthorization.php:144
-msgid "Error authorizing token"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:282 ../actions/finishopenidlogin.php:253
-#: actions/finishopenidlogin.php:259
-msgid "Error connecting user to OpenID."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-msgid "Error connecting user."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
-msgid "Error inserting avatar"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
-msgid "Error inserting new profile"
-msgstr ""
-
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
-msgid "Error inserting remote profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:201 ../actions/recoverpassword.php:240
-#: actions/recoverpassword.php:246
-msgid "Error saving address confirmation."
-msgstr ""
-
-#: ../actions/userauthorization.php:139 ../actions/userauthorization.php:140
-#: actions/userauthorization.php:147
-msgid "Error saving remote profile"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
-#: lib/openid.php:226
-msgid "Error saving the profile."
-msgstr ""
-
-#: ../lib/openid.php:237 lib/openid.php:237
-msgid "Error saving the user."
-msgstr ""
-
-#: ../actions/password.php:80 actions/profilesettings.php:399
-msgid "Error saving user; invalid."
-msgstr ""
-
-#: ../actions/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108
-msgid "Error setting user."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-msgid "Error updating profile"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
-msgid "Error updating remote profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:79 ../actions/recoverpassword.php:80
-#: actions/recoverpassword.php:80
-msgid "Error with confirmation code."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-msgid "Existing nickname"
-msgstr ""
-
-#: ../lib/util.php:298 ../lib/util.php:326 lib/util.php:342
-msgid "FAQ"
-msgstr ""
-
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-msgid "Failed updating avatar."
-msgstr ""
-
-#: ../actions/all.php:61 ../actions/allrss.php:74 ../actions/allrss.php:64
-#: actions/all.php:61 actions/allrss.php:64
-#, php-format
-msgid "Feed for friends of %s"
-msgstr ""
-
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
-#: ../actions/replies.php:65 actions/replies.php:65 actions/repliesrss.php:66
-#, php-format
-msgid "Feed for replies to %s"
-msgstr ""
-
-#: ../actions/login.php:118 ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-msgid "Full name"
-msgstr ""
-
-#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-msgid "Full name is too long (max 255 chars)."
-msgstr ""
-
-#: ../lib/util.php:279
-msgid "Help"
-msgstr "�움�"
-
-#: ../lib/util.php:274
-msgid "Home"
-msgstr "홈"
-
-#: ../actions/profilesettings.php:49
-msgid "Homepage"
-msgstr "홈페�지"
-
-#: ../actions/profilesettings.php:87
-msgid "Homepage is not a valid URL."
-msgstr "홈페�지 주소형�� 올바르지 않습니다."
-
-#: ../actions/imsettings.php:61
-msgid "IM Address"
-msgstr "메신저 주소"
-
-#: ../actions/imsettings.php:33
-msgid "IM Settings"
-msgstr "메신저 설정"
-
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr ""
-
-#: ../actions/openidsettings.php:45
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-
-#: ../actions/recoverpassword.php:122
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/password.php:69 actions/profilesettings.php:388
-msgid "Incorrect old password"
-msgstr ""
-
-#: ../actions/login.php:63 ../actions/login.php:67 actions/login.php:67
-msgid "Incorrect username or password."
-msgstr ""
-
-#: ../actions/recoverpassword.php:226 ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-
-#: ../actions/updateprofile.php:113 ../actions/updateprofile.php:114
-#: actions/updateprofile.php:115
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:97 ../actions/updateprofile.php:98
-#: actions/updateprofile.php:99
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:81 ../actions/updateprofile.php:82
-#: actions/updateprofile.php:83
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr ""
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-msgid "Invalid notice content"
-msgstr ""
-
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-msgid "Invalid notice uri"
-msgstr ""
-
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-msgid "Invalid notice url"
-msgstr ""
-
-#: ../actions/updateprofile.php:86 ../actions/updateprofile.php:87
-#: actions/updateprofile.php:88
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-msgid "Invalid profile URL (bad format)"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
-msgid "Invalid profile URL returned by server."
-msgstr ""
-
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-msgid "Invalid size."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84 ../actions/finishopenidlogin.php:235
-#: ../actions/register.php:93 ../actions/register.php:111
-#: actions/finishopenidlogin.php:241 actions/register.php:103
-#: actions/register.php:121
-msgid "Invalid username or password."
-msgstr ""
-
-#: ../lib/util.php:237 ../lib/util.php:261 lib/util.php:277
-#, php-format
-msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-
-#: ../actions/imsettings.php:164 ../actions/imsettings.php:173
-#: actions/imsettings.php:181
-msgid "Jabber ID already belongs to another user."
-msgstr ""
-
-#: ../actions/imsettings.php:63 ../actions/imsettings.php:62
-#: actions/imsettings.php:63
-#, php-format
-msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
-msgstr ""
-
-#: ../actions/profilesettings.php:55
-msgid "Location"
-msgstr "위치"
-
-#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-msgid "Location is too long (max 255 chars)."
-msgstr ""
-
-#: ../actions/login.php:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
-msgid "Login"
-msgstr "로그�"
-
-#: ../actions/openidlogin.php:44
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "[OpenID](%%doc.openid%%)로 로그�하세요."
-
-#: ../actions/login.php:122 ../actions/login.php:126
-#, php-format
-msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
-msgstr ""
-
-#: ../lib/util.php:284
-msgid "Logout"
-msgstr "로그아웃"
-
-#: ../actions/login.php:106
-msgid "Lost or forgotten password?"
-msgstr "비밀번호를 잊어버리셨어요?"
-
-#: ../actions/showstream.php:281 ../actions/showstream.php:300
-#: actions/showstream.php:315
-msgid "Member since"
-msgstr ""
-
-#: ../actions/userrss.php:70 actions/userrss.php:67
-#, php-format
-msgid "Microblog by %s"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
-#: ../actions/register.php:188 actions/finishopenidlogin.php:85
-#: actions/register.php:202
-msgid "My text and files are available under "
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-msgid "New nickname"
-msgstr ""
-
-#: ../actions/newnotice.php:100 ../actions/newnotice.php:87
-#: actions/newnotice.php:96
-msgid "New notice"
-msgstr ""
-
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
-#: ../actions/recoverpassword.php:179 actions/profilesettings.php:180
-#: actions/recoverpassword.php:185
-msgid "New password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:275 ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr ""
-
-#: ../actions/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
-msgid "Nickname"
-msgstr "닉네임"
-
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-msgid "Nickname already in use. Try another one."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
-#: ../actions/profilesettings.php:88 ../actions/register.php:67
-#: ../actions/updateprofile.php:77 actions/finishopenidlogin.php:171
-#: actions/profilesettings.php:203 actions/register.php:74
-#: actions/updateprofile.php:78
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-msgid "Nickname not allowed."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-msgid "Nickname of the user you want to follow"
-msgstr ""
-
-#: ../actions/recoverpassword.php:147 ../actions/recoverpassword.php:162
-#: actions/recoverpassword.php:167
-msgid "Nickname or email"
-msgstr ""
-
-#: ../actions/imsettings.php:147 ../actions/imsettings.php:156
-#: actions/imsettings.php:164
-msgid "No Jabber ID."
-msgstr ""
-
-#: ../actions/userauthorization.php:128 ../actions/userauthorization.php:129
-#: actions/userauthorization.php:136
-msgid "No authorization request!"
-msgstr ""
-
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-msgid "No confirmation code."
-msgstr ""
-
-#: ../actions/newnotice.php:49 ../actions/newnotice.php:44
-#: actions/newmessage.php:53 actions/newnotice.php:44 classes/Command.php:197
-msgid "No content!"
-msgstr ""
-
-#: ../actions/userbyid.php:27 ../actions/userbyid.php:32
-#: actions/userbyid.php:32
-msgid "No id."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
-msgid "No nickname provided by remote server."
-msgstr ""
-
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-msgid "No nickname."
-msgstr ""
-
-#: ../actions/imsettings.php:197 ../actions/emailsettings.php:222
-#: ../actions/imsettings.php:206 ../actions/smssettings.php:229
-#: actions/emailsettings.php:240 actions/imsettings.php:214
-#: actions/smssettings.php:237
-msgid "No pending confirmation to cancel."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
-msgid "No profile URL returned by server."
-msgstr ""
-
-#: ../actions/recoverpassword.php:189 ../actions/recoverpassword.php:226
-#: actions/recoverpassword.php:232
-msgid "No registered email address for that user."
-msgstr ""
-
-#: ../actions/userauthorization.php:48 ../actions/userauthorization.php:49
-#: actions/userauthorization.php:55
-msgid "No request found!"
-msgstr ""
-
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-msgid "No results"
-msgstr ""
-
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-msgid "No size."
-msgstr ""
-
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-msgid "No such OpenID."
-msgstr ""
-
-#: ../actions/doc.php:29 actions/doc.php:29
-msgid "No such document."
-msgstr ""
-
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
-#: ../actions/shownotice.php:83 ../lib/deleteaction.php:30
-#: actions/shownotice.php:32 actions/shownotice.php:83 lib/deleteaction.php:30
-msgid "No such notice."
-msgstr ""
-
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-msgid "No such recovery code."
-msgstr ""
-
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-msgid "No such subscription"
-msgstr ""
-
-#: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
-#: ../actions/foaf.php:40 ../actions/replies.php:57
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/xrds.php:35 ../lib/gallery.php:57 ../lib/subs.php:33
-#: ../lib/subs.php:82 actions/all.php:34 actions/allrss.php:35
-#: actions/avatarbynickname.php:43 actions/favoritesrss.php:35
-#: actions/foaf.php:40 actions/ical.php:31 actions/remotesubscribe.php:93
-#: actions/remotesubscribe.php:100 actions/replies.php:57
-#: actions/repliesrss.php:35 actions/showfavorites.php:34
-#: actions/showstream.php:110 actions/userbyid.php:36 actions/userrss.php:35
-#: actions/xrds.php:35 classes/Command.php:120 classes/Command.php:162
-#: classes/Command.php:203 classes/Command.php:237 lib/gallery.php:62
-#: lib/mailbox.php:36 lib/subs.php:33 lib/subs.php:95
-msgid "No such user."
-msgstr ""
-
-#: ../lib/gallery.php:76 ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-msgid "Not a recovery code."
-msgstr ""
-
-#: ../actions/imsettings.php:158 ../actions/imsettings.php:167
-#: actions/imsettings.php:175
-msgid "Not a valid Jabber ID"
-msgstr ""
-
-#: ../lib/openid.php:131 lib/openid.php:131
-msgid "Not a valid OpenID."
-msgstr ""
-
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
-#: ../actions/register.php:63 actions/register.php:70
-msgid "Not a valid email address."
-msgstr ""
-
-#: ../actions/profilesettings.php:83 ../actions/register.php:61
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-msgid "Not a valid nickname."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:118 ../actions/remotesubscribe.php:120
-#: actions/remotesubscribe.php:129
-msgid "Not a valid profile URL (incorrect services)."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:111 ../actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:122
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr ""
-
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-msgid "Not an image or corrupt file."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
-msgid "Not authorized."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
-msgid "Not expecting this response!"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
-#: ../actions/logout.php:33 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: actions/disfavor.php:29 actions/favor.php:30 actions/finishaddopenid.php:29
-#: actions/logout.php:33 actions/newmessage.php:28 actions/newnotice.php:29
-#: actions/subscribe.php:28 actions/unsubscribe.php:25 lib/deleteaction.php:38
-#: lib/settingsaction.php:27
-msgid "Not logged in."
-msgstr ""
-
-#: ../actions/unsubscribe.php:43 ../lib/subs.php:91 lib/subs.php:104
-msgid "Not subscribed!."
-msgstr ""
-
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#, php-format
-msgid "Notice feed for %s"
-msgstr ""
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-msgid "Notice has no profile"
-msgstr ""
-
-#: ../actions/showstream.php:297 ../actions/showstream.php:316
-#: actions/showstream.php:331
-msgid "Notices"
-msgstr ""
-
-#: ../actions/password.php:39 actions/profilesettings.php:178
-msgid "Old password"
-msgstr ""
-
-#: ../lib/util.php:288
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-msgid "OpenID Account Setup"
-msgstr ""
-
-#: ../lib/openid.php:180 lib/openid.php:180
-msgid "OpenID Auto-Submit"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
-msgid "OpenID Login"
-msgstr "OpenID 로그�"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-msgid "OpenID URL"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-msgid "OpenID authentication cancelled."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr ""
-
-#: ../lib/openid.php:133 lib/openid.php:133
-#, php-format
-msgid "OpenID failure: %s"
-msgstr ""
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-msgid "OpenID removed."
-msgstr ""
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-msgid "OpenID settings"
-msgstr ""
-
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-msgid "Partial upload."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
-msgid "Password"
-msgstr "비밀번호"
-
-#: ../actions/recoverpassword.php:249
-msgid "Password and confirmation do not match."
-msgstr "비밀번호가 �치하지 않습니다."
-
-#: ../actions/recoverpassword.php:245 ../actions/recoverpassword.php:284
-#: actions/recoverpassword.php:297
-msgid "Password must be 6 chars or more."
-msgstr ""
-
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-msgid "Password recovery requested"
-msgstr ""
-
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
-#: ../actions/recoverpassword.php:313 actions/profilesettings.php:408
-#: actions/recoverpassword.php:326
-msgid "Password saved."
-msgstr ""
-
-#: ../actions/password.php:61 ../actions/register.php:65
-msgid "Passwords don't match."
-msgstr "비밀번호가 �치하지 않습니다."
-
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-msgid "People search"
-msgstr ""
-
-#: ../lib/stream.php:44 ../lib/stream.php:50 lib/personal.php:50
-msgid "Personal"
-msgstr ""
-
-#: ../actions/userauthorization.php:77 ../actions/userauthorization.php:78
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user's notices. If you didn't just ask to subscribe to someone's notices, "
-"click \"Cancel\"."
-msgstr ""
-
-#: ../actions/imsettings.php:74 ../actions/imsettings.php:73
-#: actions/imsettings.php:74
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
-
-#: ../actions/imsettings.php:68 ../actions/emailsettings.php:85
-#: ../actions/imsettings.php:67 ../actions/smssettings.php:94
-#: actions/emailsettings.php:86 actions/imsettings.php:68
-#: actions/smssettings.php:94 actions/twittersettings.php:70
-msgid "Preferences"
-msgstr ""
-
-#: ../actions/imsettings.php:135 ../actions/emailsettings.php:162
-#: ../actions/imsettings.php:144 ../actions/smssettings.php:163
-#: actions/emailsettings.php:180 actions/imsettings.php:152
-#: actions/smssettings.php:171
-msgid "Preferences saved."
-msgstr ""
-
-#: ../lib/util.php:300
-msgid "Privacy"
-msgstr "개�정보보호"
-
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119
-msgid "Problem saving notice."
-msgstr ""
-
-#: ../lib/stream.php:54 ../lib/settingsaction.php:84 ../lib/stream.php:60
-#: lib/personal.php:60 lib/settingsaction.php:84
-msgid "Profile"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-msgid "Profile URL"
-msgstr ""
-
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-msgid "Profile settings"
-msgstr ""
-
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
-#: ../actions/updateprofile.php:52 actions/postnotice.php:52
-#: actions/updateprofile.php:53
-msgid "Profile unknown"
-msgstr ""
-
-#: ../lib/util.php:276
-msgid "Public"
-msgstr ""
-
-#: ../actions/public.php:54 actions/public.php:54
-msgid "Public Stream Feed"
-msgstr ""
-
-#: ../actions/public.php:33 actions/public.php:33
-msgid "Public timeline"
-msgstr ""
-
-#: ../actions/recoverpassword.php:151 ../actions/recoverpassword.php:166
-#: actions/recoverpassword.php:171
-msgid "Recover"
-msgstr ""
-
-#: ../actions/recoverpassword.php:141 ../actions/recoverpassword.php:156
-#: actions/recoverpassword.php:161
-msgid "Recover password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-msgid "Recovery code for unknown user."
-msgstr ""
-
-#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
-msgid "Register"
-msgstr "회�가입"
-
-#: ../actions/userauthorization.php:119 ../actions/userauthorization.php:120
-#: actions/userauthorization.php:127
-msgid "Reject"
-msgstr ""
-
-#: ../actions/login.php:99 ../actions/register.php:183
-msgid "Remember me"
-msgstr "�� 로그�"
-
-#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
-msgid "Remote profile with no matching profile"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-msgid "Remote subscribe"
-msgstr ""
-
-#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-msgid "Remove"
-msgstr "삭제"
-
-#: ../actions/openidsettings.php:68
-msgid "Remove OpenID"
-msgstr "OpenID 삭제"
-
-#: ../actions/openidsettings.php:73
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-
-#: ../lib/stream.php:49 ../lib/stream.php:55 lib/personal.php:55
-msgid "Replies"
-msgstr ""
-
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
-#: ../lib/stream.php:56 actions/replies.php:47 actions/repliesrss.php:62
-#: lib/personal.php:56
-#, php-format
-msgid "Replies to %s"
-msgstr ""
-
-#: ../actions/recoverpassword.php:168 ../actions/recoverpassword.php:183
-#: actions/recoverpassword.php:189
-msgid "Reset"
-msgstr ""
-
-#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
-msgid "Reset password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-msgid "Same as password above"
-msgstr ""
-
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
-#: actions/emailsettings.php:104 actions/imsettings.php:82
-#: actions/profilesettings.php:101 actions/smssettings.php:100
-#: actions/twittersettings.php:83
-msgid "Save"
-msgstr ""
-
-#: ../lib/searchaction.php:73 ../lib/util.php:277
-msgid "Search"
-msgstr "검색"
-
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-msgid "Search Stream Feed"
-msgstr ""
-
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#, php-format
-msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
-msgstr ""
-
-#: ../actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-"Separate the terms by spaces; they must be 3 characters or more."
-msgstr ""
-
-#: ../lib/util.php:982 ../actions/invite.php:137 ../lib/util.php:1172
-#: actions/invite.php:145 lib/util.php:1306 lib/util.php:1731
-msgid "Send"
-msgstr ""
-
-#: ../actions/imsettings.php:71 ../actions/imsettings.php:70
-#: actions/imsettings.php:71
-msgid "Send me notices through Jabber/GTalk."
-msgstr ""
-
-#: ../lib/util.php:282 ../lib/util.php:304 lib/util.php:320
-msgid "Settings"
-msgstr ""
-
-#: ../actions/profilesettings.php:183 ../actions/profilesettings.php:192
-#: actions/profilesettings.php:307
-msgid "Settings saved."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-msgid "Someone else already has this OpenID."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-msgid "Something weird happened."
-msgstr ""
-
-#: ../lib/util.php:302
-msgid "Source"
-msgstr "소스 코드"
-
-#: ../actions/showstream.php:277
-msgid "Statistics"
-msgstr "통계"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
-#: ../actions/finishopenidlogin.php:246 actions/finishopenidlogin.php:188
-#: actions/finishopenidlogin.php:252
-msgid "Stored OpenID not found."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-msgid "Subscribe"
-msgstr ""
-
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
-#: ../actions/showstream.php:313 actions/showstream.php:328
-#: actions/subscribers.php:27
-msgid "Subscribers"
-msgstr ""
-
-#: ../actions/userauthorization.php:309 ../actions/userauthorization.php:310
-#: actions/userauthorization.php:322
-msgid "Subscription authorized"
-msgstr ""
-
-#: ../actions/userauthorization.php:319 ../actions/userauthorization.php:320
-#: actions/userauthorization.php:332
-msgid "Subscription rejected"
-msgstr ""
-
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27 ../actions/showstream.php:230
-#: ../actions/showstream.php:307 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-msgid "Subscriptions"
-msgstr ""
-
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-msgid "System error uploading file."
-msgstr ""
-
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-msgid "Text search"
-msgstr ""
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-msgid "That OpenID does not belong to you."
-msgstr ""
-
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-msgid "That address has already been confirmed."
-msgstr ""
-
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-msgid "That confirmation code is not for you!"
-msgstr ""
-
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-msgid "That file is too big."
-msgstr ""
-
-#: ../actions/imsettings.php:161 ../actions/imsettings.php:170
-#: actions/imsettings.php:178
-msgid "That is already your Jabber ID."
-msgstr ""
-
-#: ../actions/imsettings.php:224 ../actions/imsettings.php:233
-#: actions/imsettings.php:241
-msgid "That is not your Jabber ID."
-msgstr ""
-
-#: ../actions/imsettings.php:201 ../actions/emailsettings.php:226
-#: ../actions/imsettings.php:210 actions/emailsettings.php:244
-#: actions/imsettings.php:218
-msgid "That is the wrong IM address."
-msgstr ""
-
-#: ../actions/newnotice.php:52 ../actions/newnotice.php:49
-#: ../actions/twitapistatuses.php:408 actions/newnotice.php:49
-#: actions/twitapistatuses.php:330
-msgid "That's too long. Max notice size is 140 chars."
-msgstr ""
-
-#: ../actions/confirmaddress.php:86 ../actions/confirmaddress.php:92
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr ""
-
-#: ../actions/imsettings.php:241 ../actions/emailsettings.php:264
-#: ../actions/imsettings.php:250 ../actions/smssettings.php:274
-#: actions/emailsettings.php:282 actions/imsettings.php:258
-#: actions/smssettings.php:282
-msgid "The address was removed."
-msgstr ""
-
-#: ../actions/userauthorization.php:311 ../actions/userauthorization.php:312
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-
-#: ../actions/userauthorization.php:321 ../actions/userauthorization.php:322
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr ""
-
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr ""
-
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr ""
-
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr ""
-
-#: ../actions/recoverpassword.php:87 ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr ""
-
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your OpenID "
-"to a local account. You can either create a new account, or connect with "
-"your existing account, if you have one."
-msgstr ""
-
-#: ../lib/util.php:147 ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:43
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
-msgstr ""
-
-#: ../actions/profilesettings.php:51 ../actions/profilesettings.php:48
-#: ../actions/register.php:169 actions/profilesettings.php:81
-#: actions/register.php:183
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-msgid "URL of your profile on another compatible microblogging service"
-msgstr ""
-
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/smssettings.php:135 actions/emailsettings.php:144
-#: actions/imsettings.php:118 actions/recoverpassword.php:39
-#: actions/smssettings.php:143 actions/twittersettings.php:108
-msgid "Unexpected form submission."
-msgstr ""
-
-#: ../actions/recoverpassword.php:237 ../actions/recoverpassword.php:276
-#: actions/recoverpassword.php:289
-msgid "Unexpected password reset."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
-msgid "Unknown version of OMB protocol."
-msgstr ""
-
-#: ../lib/util.php:245 ../lib/util.php:269 lib/util.php:285
-msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
-msgstr ""
-
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr ""
-
-#: ../actions/showstream.php:193 ../actions/showstream.php:209
-#: actions/showstream.php:219
-msgid "Unsubscribe"
-msgstr ""
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
-#: ../actions/updateprofile.php:45 actions/postnotice.php:45
-#: actions/updateprofile.php:46
-msgid "Unsupported OMB version"
-msgstr ""
-
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-msgid "Unsupported image file format."
-msgstr ""
-
-#: ../actions/avatar.php:68
-msgid "Upload"
-msgstr "�미지 올리기"
-
-#: ../actions/avatar.php:27
-msgid ""
-"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
-"you upload it, so make sure it's more or less square. It must be under the "
-"site license, also. Use a picture that belongs to you and that you want to "
-"share."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
-#: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88
-msgid "User being listened to doesn't exist."
-msgstr ""
-
-#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/foaf.php:47
-#: ../actions/twitapiaccount.php:82 ../actions/twitapistatuses.php:319
-#: ../actions/twitapistatuses.php:685 ../actions/twitapiusers.php:82
-#: actions/all.php:41 actions/avatarbynickname.php:48 actions/foaf.php:47
-#: actions/replies.php:41 actions/showfavorites.php:41
-#: actions/showstream.php:44 actions/twitapiaccount.php:80
-#: actions/twitapifavorites.php:68 actions/twitapistatuses.php:235
-#: actions/twitapistatuses.php:609 actions/twitapiusers.php:87
-#: lib/mailbox.php:50
-msgid "User has no profile."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-msgid "User nickname"
-msgstr ""
-
-#: ../lib/util.php:969 ../lib/util.php:1159 lib/util.php:1293
-#, php-format
-msgid "What's up, %s?"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 ../actions/profilesettings.php:54
-#: ../actions/register.php:175 actions/profilesettings.php:87
-#: actions/register.php:189
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
-
-#: ../actions/updateprofile.php:127 ../actions/updateprofile.php:128
-#: actions/updateprofile.php:129
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:122 ../actions/updateprofile.php:123
-#: actions/updateprofile.php:124
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-msgid "You already have this OpenID!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-msgid "You are already logged in!"
-msgstr ""
-
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr ""
-
-#: ../actions/register.php:164 ../actions/register.php:135
-#: actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr ""
-
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
-msgstr ""
-
-#: ../actions/profilesettings.php:27
-msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-msgid "You can use the local subscription!"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
-#: ../actions/register.php:61 actions/finishopenidlogin.php:38
-#: actions/register.php:68
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: ../actions/updateprofile.php:62 ../actions/updateprofile.php:63
-#: actions/updateprofile.php:64
-msgid "You did not send us that profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:134 ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr ""
-
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-msgid "Your OpenID URL"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr ""
-
-#: ../actions/openidsettings.php:28
-#, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
-msgstr ""
-
-#: ../lib/util.php:814 ../lib/util.php:943 lib/util.php:992
-msgid "a few seconds ago"
-msgstr ""
-
-#: ../lib/util.php:826
-#, php-format
-msgid "about %d days ago"
-msgstr "%d�전"
-
-#: ../lib/util.php:822
-#, php-format
-msgid "about %d hours ago"
-msgstr "%d시간전"
-
-#: ../lib/util.php:818
-#, php-format
-msgid "about %d minutes ago"
-msgstr "%d분전"
-
-#: ../lib/util.php:830 ../lib/util.php:959 lib/util.php:1008
-#, php-format
-msgid "about %d months ago"
-msgstr ""
-
-#: ../lib/util.php:824 ../lib/util.php:953 lib/util.php:1002
-msgid "about a day ago"
-msgstr ""
-
-#: ../lib/util.php:816 ../lib/util.php:945 lib/util.php:994
-msgid "about a minute ago"
-msgstr ""
-
-#: ../lib/util.php:828 ../lib/util.php:957 lib/util.php:1006
-msgid "about a month ago"
-msgstr ""
-
-#: ../lib/util.php:832 ../lib/util.php:961 lib/util.php:1010
-msgid "about a year ago"
-msgstr ""
-
-#: ../lib/util.php:820 ../lib/util.php:949 lib/util.php:998
-msgid "about an hour ago"
-msgstr ""
-
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101 ../actions/noticesearch.php:130
-#: ../actions/showstream.php:408 ../lib/stream.php:117
-#: actions/noticesearch.php:136 actions/showstream.php:426 lib/stream.php:84
-msgid "in reply to..."
-msgstr ""
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108 ../actions/noticesearch.php:137
-#: ../actions/showstream.php:415 ../lib/stream.php:124
-#: actions/noticesearch.php:143 actions/showstream.php:433 lib/stream.php:91
-msgid "reply"
-msgstr ""
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-msgid "same as password above"
-msgstr ""
-
-#: ../lib/util.php:1127 ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr ""
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-msgstr ""
-
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr ""
-
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr ""
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-msgstr ""
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
-
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-msgstr ""
-
-#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
-msgstr ""
-
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
-msgstr ""
-
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
-msgstr ""
-
-#: actions/disfavor.php:72
-msgid "Favor"
-msgstr ""
-
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
-
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
-msgstr ""
-
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
-msgstr ""
-
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr ""
-
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#, php-format
-msgid "%s favorite notices"
-msgstr ""
-
-#: actions/favoritesrss.php:64
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr ""
-
-#: actions/inbox.php:28
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr ""
-
-#: actions/inbox.php:30
-#, php-format
-msgid "Inbox for %s"
-msgstr ""
-
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
-
-#: actions/invite.php:178
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-msgstr ""
-
-#: actions/login.php:104
-msgid "Automatically login in the future; "
-msgstr ""
-
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
-msgstr ""
-
-#: actions/login.php:126
-msgid "Login with your username and password. "
-msgstr ""
-
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
-msgstr ""
-
-#: actions/newmessage.php:65
-msgid "No recipient specified."
-msgstr ""
-
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
-msgstr ""
-
-#: actions/newmessage.php:108
-msgid "No such user"
-msgstr ""
-
-#: actions/newmessage.php:117
-msgid "New message"
-msgstr ""
-
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
-msgstr ""
-
-#: actions/openidsettings.php:28
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
-
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
-msgstr ""
-
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
-
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
-msgstr ""
-
-#: actions/outbox.php:28
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr ""
-
-#: actions/outbox.php:30
-#, php-format
-msgid "Outbox for %s"
-msgstr ""
-
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
-
-#: actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr ""
-
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
-msgstr ""
-
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
-msgstr ""
-
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
-msgstr ""
-
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
-msgstr ""
-
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
-msgstr ""
-
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
-msgstr ""
-
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
-msgstr ""
-
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
-msgstr ""
-
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
-msgstr ""
-
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr ""
-
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr ""
-
-#: actions/remotesubscribe.php:51
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
-
-#: actions/showfavorites.php:61
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr ""
-
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
-msgstr ""
-
-#: actions/showmessage.php:33
-msgid "No such message."
-msgstr ""
-
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr ""
-
-#: actions/showmessage.php:61
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
-
-#: actions/showmessage.php:66
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr ""
-
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr ""
-
-#: actions/smssettings.php:312
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr ""
-
-#: actions/twitapidirect_messages.php:76
-#, php-format
-msgid "Direct messages to %s"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:77
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:82
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
-msgstr ""
-
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
-#: actions/twitapifavorites.php:92
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr ""
-
-#: actions/twitapifavorites.php:95
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr ""
-
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr ""
-
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-msgstr ""
-
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr ""
-
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
-msgstr ""
-
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
-msgstr ""
-
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
-msgstr ""
-
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr ""
-
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
-msgstr ""
-
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr ""
-
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
-msgstr ""
-
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
-
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
-
-#: actions/twittersettings.php:122
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
-msgstr ""
-
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
-msgstr ""
-
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
-msgstr ""
-
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
-msgstr ""
-
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
-msgstr ""
-
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
-msgstr ""
-
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
-msgstr ""
-
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
-msgstr ""
-
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
-msgstr ""
-
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
-msgstr ""
-
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
-msgstr ""
-
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
-msgstr ""
-
-#: classes/Channel.php:113
-msgid "Command results"
-msgstr ""
-
-#: classes/Channel.php:148
-msgid "Command complete"
-msgstr ""
-
-#: classes/Channel.php:158
-msgid "Command failed"
-msgstr ""
-
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
-
-#: classes/Command.php:96
-#, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr ""
-
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
-msgstr ""
-
-#: classes/Command.php:146
-msgid "Notice marked as fave."
-msgstr ""
-
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr ""
-
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
-msgstr ""
-
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
-msgstr ""
-
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
-msgstr ""
-
-#: classes/Command.php:178
-#, php-format
-msgid "About: %s"
-msgstr ""
-
-#: classes/Command.php:200
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr ""
-
-#: classes/Command.php:214
-#, php-format
-msgid "Direct message to %s sent"
-msgstr ""
-
-#: classes/Command.php:216
-msgid "Error sending direct message."
-msgstr ""
-
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
-
-#: classes/Command.php:270
-#, php-format
-msgid "Subscribed to %s"
-msgstr ""
-
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
-
-#: classes/Command.php:295
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr ""
-
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
-msgstr ""
-
-#: classes/Command.php:313
-msgid "Notification off."
-msgstr ""
-
-#: classes/Command.php:315
-msgid "Can't turn off notification."
-msgstr ""
-
-#: classes/Command.php:333
-msgid "Notification on."
-msgstr ""
-
-#: classes/Command.php:335
-msgid "Can't turn on notification."
-msgstr ""
-
-#: classes/Command.php:344
-msgid "Commands:\n"
-msgstr ""
-
-#: classes/Message.php:53
-msgid "Could not insert message."
-msgstr ""
-
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
-msgstr ""
-
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr ""
-
-#: lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-msgstr ""
-
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
-msgstr ""
-
-#: lib/mail.php:253
-#, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
-msgstr ""
-
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
-msgstr ""
-
-#: lib/personal.php:65
-msgid "Favorites"
-msgstr ""
-
-#: lib/personal.php:66
-#, php-format
-msgid "%s's favorite notices"
-msgstr ""
-
-#: lib/personal.php:66
-msgid "User"
-msgstr ""
-
-#: lib/personal.php:75
-msgid "Inbox"
-msgstr ""
-
-#: lib/personal.php:76
-msgid "Your incoming messages"
-msgstr ""
-
-#: lib/personal.php:80
-msgid "Outbox"
-msgstr ""
-
-#: lib/personal.php:81
-msgid "Your sent messages"
-msgstr ""
-
-#: lib/settingsaction.php:99
-msgid "Twitter"
-msgstr ""
-
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
-msgstr ""
-
-#: lib/util.php:1718
-msgid "To"
-msgstr ""
-
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
-msgstr ""
diff --git a/locale/ko_KR/LC_MESSAGES/laconica.mo b/locale/ko_KR/LC_MESSAGES/laconica.mo
new file mode 100644
index 000000000..a507ed8e3
--- /dev/null
+++ b/locale/ko_KR/LC_MESSAGES/laconica.mo
diff --git a/locale/ko_KR/LC_MESSAGES/laconica.po b/locale/ko_KR/LC_MESSAGES/laconica.po
new file mode 100644
index 000000000..5898a6ca8
--- /dev/null
+++ b/locale/ko_KR/LC_MESSAGES/laconica.po
@@ -0,0 +1,4718 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-01-27 17:45+0000\n"
+"Last-Translator: JaeHo Choi <sayhi2choi@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"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 "개�정보를 제외한: 패스워드, 메� 주소, 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"
+"%4$s �고\n"
+"\n"
+"%1$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"
+"%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$ � �태 %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 �블릭 스트림"
+
+#: ../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/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33
+#, 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 타임��"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s 모�로부터� 업��트!"
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr "(지금 귀하는 귀하� �메� 주소를 확�하는 방법� 대한 지침� 메�로 받으셨습니다.)"
+
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)가 제공하는 "
+"마��로블로깅서비스입니다."
+
+#: ../lib/util.php:259 lib/util.php:275 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
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr "�� 코드가 추가하신 메신저 주소로 보내졌습니다. %s 를 확�해 주셔야 메시지가 전달�니다."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr "�� 코드가 추가하신 �메�로 보내졌습니다. 수신함(�는 스팸함)� 확�하셔서 코드와 사용법� 확�하여 주시기 바�니다."
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr "�� 코드가 추가하신 휴대�으로 보내졌습니다. 수신함(�는 스팸함)� 확�하셔서 코드와 사용법� 확�하여 주시기 바�니다."
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55 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 "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/twitapilaconica.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 "About"
+
+#: ../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/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
+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 "아바타가 업��트 �었습니다."
+
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
+msgstr "� 주소는 �� 대기중입니다. Jabber/Gtalk 로 메세지를 확�해 주세요.(%s 를 추가하셨습니까?)"
+
+#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr "� 주소는 �� 대기중입니다. 수신함(�는 스팸함)� 확�하셔서 지침� 확�해 주시기 바�니다."
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+#: 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 "아바타(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 "새 비밀번호를 저장 할 수 없습니다."
+
+#: ../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 object 를 �성할 수 없습니다."
+
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
+msgid "Cannot normalize that Jabber ID"
+msgstr "그 Jabbar ID 를 정규화 할 수 없습니다."
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr "그 �메� 주소를 정규화 할 수 없습니다."
+
+#: ../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"
+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/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+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."
+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/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 "컨�트"
+
+#: ../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/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/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow 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/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/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."
+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/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 "홈페�지 주소형�� 올바르지 않습니다."
+
+#: ../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/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 "틀린 패스워드"
+
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
+msgid "Incorrect username or password."
+msgstr "틀린 계정 �는 패스워드"
+
+#: ../actions/recoverpassword.php:265
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr "가입하신 �메�로 패스워드 재발급� 관한 지시가 보내졌습니다."
+
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: 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
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "옳지 않� �메� 주소 : %s"
+
+#: ../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/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"
+
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
+#, php-format
+msgid "Invalid profile URL '%s'."
+msgstr "옳지 않� 프로필 URL '%s'."
+
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135
+msgid "Invalid profile URL (bad format)"
+msgstr "옳지 않� 프로필 URL (나� �멧)"
+
+#: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
+msgid "Invalid profile URL returned by server."
+msgstr "서버� �하여 �아온 옳지 않� 프로필 URL "
+
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+" [Laconica](http://laconi.ca/) � �하여 제공�는 마��로블로깅 소프트웨어, 버전 %s, 다�� ��센스 "
+"[GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html) 를 가지고 있습니다."
+
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: 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 ""
+"\"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글�)"
+
+#: ../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 "[OpenID](%%doc.openid%%)로 로그�하세요."
+
+#: ../actions/login.php:126
+#, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
+msgstr ""
+"귀하� 계정과 패스워드로 로그� 하세요. 계정� 아� 없으세요? [가입](%%action.register%%) 새 계정� �성 �는 "
+"[OpenID](%%action.openidlogin%%) 를 사용해 보세요."
+
+#: ../lib/util.php:308 lib/util.php:324 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 "패스워드를 잃으셨나요?"
+
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "�스팅� 위한 새 �메� 계정� �성; 전 �메� 계정� 취소."
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php: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/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."
+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 "새로운"
+
+#: ../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/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 "�메�� 추가 �지 않았습니다."
+
+#: ../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/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/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+msgid "No status with that ID found."
+msgstr "발견� ID� �태가 없습니다."
+
+#: ../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/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/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� 아닙니다. (YADIS 문서가 없습니다)"
+
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
+msgid "Not an image or corrupt file."
+msgstr "�미지가 아니거나 ��� 파� 입니다."
+
+#: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
+msgid "Not authorized."
+msgstr "��� �지 않았습니다."
+
+#: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+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 "옛 패스워드"
+
+#: ../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/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/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/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/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"
+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"
+msgstr "개��� 메시지"
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "지역번호와 함께 �어쓰기 없� 번호를 �어 주세요."
+
+#: ../actions/userauthorization.php:78
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user's notices. If you didn't just ask to subscribe to someone's notices, "
+"click \"Cancel\"."
+msgstr "유저� 통지를 구�하려면 �세를 확�해 주세요. 구�하지 않는 경우는,\"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/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/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/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
+msgid "Public timeline"
+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:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+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/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+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/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
+msgid "Remote profile with no matching profile"
+msgstr "리모트 프로필과 �치하는 것� 없습니다."
+
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
+msgid "Remote subscribe"
+msgstr "리모트 구� 예약"
+
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 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/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
+msgid "Remove OpenID"
+msgstr "OpenID 삭제"
+
+#: ../actions/openidsettings.php:73
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr "마지막 OpenID 를 삭제하면, 로그� 할 수 없게 �니다! 삭제하기 전�, 다른 OpenID 를 추가해 주세요."
+
+#: ../lib/stream.php: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"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: 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 "스트림 피드를 검색"
+
+#: ../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/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr "%%site.name%% � 사람� �름, 장소, �미로 검색. 검색어는 스페�스 구분한다; �어� 3글� �� 필요."
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: 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/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/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "그 �� 코드는 귀하� 것� 아닙니다!"
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr "그 �메� 주소는 �미 다른 유저� 소유입니다."
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: 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."
+msgstr "그 �메� 주소는 �미 귀하� 것입니다."
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+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: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 "옳지 않� 메신저 계정 입니다."
+
+#: ../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
+#, 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:"
+msgstr ""
+"구�� 승� �었습니다. 하지만 콜백 URL� 통과 �지 않았습니다. 웹사�트� 지시를 찾아 구� 승� 방법� 대하여 �어보십시오. "
+"귀하� 구� 토�� : "
+
+#: ../actions/userauthorization.php:322
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site's instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"구�� 해지 �었습니다. 하지만 콜백 URL� 통과 �지 않았습니다. 웹사�트� 지시를 찾아 구� 해지 방법� 대하여 �어보십시오."
+
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "%s � 통지를 받고 있는 사람"
+
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
+msgid "These are the people who listen to your notices."
+msgstr "귀하� 통지를 받고 있는 사람들"
+
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "%s 가 받고 있는 통지들� 사람들"
+
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+msgid "These are the people whose notices you listen to."
+msgstr "귀하� 통지를 받고 있는 사람"
+
+#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+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 "� 메서드는 등� �는 삭제를 요구합니다."
+
+#: ../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"
+msgstr "타임존"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr "타임존� 설정 �지 않았습니다."
+
+#: ../actions/remotesubscribe.php:43
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: 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 ""
+
+#: ../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 ""
+
+#: ../lib/util.php:269 lib/util.php:285
+msgid ""
+"Unless otherwise specified, contents of this site are copyright by the "
+"contributors and available under the "
+msgstr ""
+
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
+msgid "Unsupported image file format."
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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."
+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 ""
+
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
+msgid "User nickname"
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#, php-format
+msgid "What's up, %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\""
+msgstr ""
+
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
+#, php-format
+msgid "Wrong image type for '%s'"
+msgstr ""
+
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
+#, 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
+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!"
+msgstr ""
+
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/password.php:27
+msgid "You can change your password here. Choose a good one!"
+msgstr ""
+
+#: ../actions/register.php:135 actions/register.php:145
+msgid "You can create a new account to start posting notices."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../actions/openidsettings.php:86
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+
+#: ../actions/profilesettings.php:27
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: 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
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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 ""
+
+#: ../actions/recoverpassword.php:164
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+
+#: ../actions/openidsettings.php:28
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
+"account.  Manage your associated OpenIDs from here."
+msgstr ""
+
+#: ../lib/util.php:943 lib/util.php:992 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 ""
+
+#: ../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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
+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/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 ""
+
+#: 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
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53 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 ""
+
+#: 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 ""
+
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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
+#, php-format
+msgid "Feed for favorites of %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 ""
+
+#: 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/showmessage.php:61 actions/showmessage.php:108
+#, 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"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, 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"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#, 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"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, 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."
+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/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#, php-format
+msgid "%s updates favorited by %s / %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 ""
+
+#: 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 ""
+
+#: 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/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 ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: 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 ""
+
+#: 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/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 ""
+
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96 classes/Command.php:113
+#, 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."
+msgstr ""
+
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175 classes/Command.php:198
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270 classes/Command.php:307
+#, 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"
+msgstr ""
+
+#: classes/Command.php:295 classes/Command.php:335
+#, 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."
+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 ""
+
+#: 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 ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253 lib/mail.php:512
+#, 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."
+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
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: 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 ""
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, php-format
+msgid "%s and friends, page %d"
+msgstr ""
+
+#: actions/avatarsettings.php:76
+msgid "You can upload your personal avatar."
+msgstr ""
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+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 ""
+
+#: 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
+#, php-format
+msgid "The address \"%s\" has been "
+msgstr ""
+
+#: actions/deletenotice.php:73
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
+#, 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"
+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
+#, 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
+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 ""
+
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+msgid "Nickname must have only lowercase letters "
+msgstr ""
+
+#: actions/editgroup.php:198 actions/newgroup.php:149
+msgid "description is too long (max 140 chars)."
+msgstr ""
+
+#: actions/editgroup.php:218
+msgid "Could not update group."
+msgstr ""
+
+#: actions/editgroup.php:226
+msgid "Options saved."
+msgstr ""
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr ""
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
+msgstr ""
+
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
+msgstr ""
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+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. "
+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 ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, php-format
+msgid "Allow %s to update my Facebook status"
+msgstr ""
+
+#: actions/facebookhome.php:218
+msgid "Skip"
+msgstr ""
+
+#: actions/facebookhome.php:235
+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 ""
+
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
+msgstr ""
+
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
+msgstr ""
+
+#: actions/facebookinvite.php:105
+#, php-format
+msgid "Invite your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, 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."
+msgstr ""
+
+#: actions/facebooksettings.php:106
+msgid "Prefix"
+msgstr ""
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, 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
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.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
+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/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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "로그아웃"
+
+#: actions/grouplogo.php:450
+msgid "Failed updating logo."
+msgstr ""
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+msgstr ""
+
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+msgid "Create a new group"
+msgstr ""
+
+#: actions/groupsearch.php:57
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+msgstr ""
+
+#: actions/groupsearch.php:63
+msgid "Group search"
+msgstr ""
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
+msgstr ""
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+msgid "Send me replies through Jabber/GTalk "
+msgstr ""
+
+#: actions/imsettings.php:321
+#, 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 ""
+
+#: actions/joingroup.php:128
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr ""
+
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
+msgstr ""
+
+#: 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 ""
+
+#: actions/leavegroup.php:138
+#, php-format
+msgid "Could not remove user %s to group %s"
+msgstr ""
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: 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 ""
+
+#: 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/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "OpenID 로그�"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "OpenID 삭제"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "메신저 설정"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:112
+#, fuzzy
+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 ""
+
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr ""
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "비밀번호"
+
+#: actions/peopletag.php:35
+#, 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 ""
+
+#: actions/peopletag.php:91
+#, 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"
+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 ""
+
+#: actions/profilesettings.php:311
+msgid "Couldn't save tags."
+msgstr ""
+
+#: actions/public.php:107
+#, php-format
+msgid "Public timeline, page %d"
+msgstr ""
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/public.php:220
+#, 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"
+msgstr ""
+
+#: actions/publictagcloud.php:63
+#, 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 ""
+
+#: 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, "
+msgstr ""
+
+#: actions/register.php:471
+#, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr ""
+
+#: 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 ""
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
+msgstr ""
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
+
+#: actions/showgroup.php:206
+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"
+msgstr ""
+
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+msgid "Note"
+msgstr ""
+
+#: actions/showgroup.php:270
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, php-format
+msgid "Notice feed for %s group"
+msgstr ""
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+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 ""
+
+#: actions/showgroup.php:370
+msgid "All members"
+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 "
+msgstr ""
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
+msgstr ""
+
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
+msgstr ""
+
+#: actions/showstream.php:143
+msgid "'s profile"
+msgstr ""
+
+#: actions/showstream.php:236 actions/tagother.php:77
+msgid "User profile"
+msgstr ""
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+msgid "All subscribers"
+msgstr ""
+
+#: actions/showstream.php:533
+msgid "All groups"
+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 "
+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. "
+msgstr ""
+
+#: actions/smssettings.php:453
+msgid "Mobile carrier"
+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 ""
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr ""
+
+#: actions/subscribers.php:63
+msgid "These are the people who listen to "
+msgstr ""
+
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who "
+msgstr ""
+
+#: actions/subscriptions.php:52
+#, php-format
+msgid "%s subscriptions"
+msgstr ""
+
+#: actions/subscriptions.php:54
+#, php-format
+msgid "%s subscriptions, page %d"
+msgstr ""
+
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices "
+msgstr ""
+
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose "
+msgstr ""
+
+#: actions/subscriptions.php:122
+msgid "Jabber"
+msgstr ""
+
+#: actions/tag.php:43
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr ""
+
+#: actions/tag.php:66
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+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: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."
+msgstr ""
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:198
+msgid "Could not save tags."
+msgstr ""
+
+#: actions/tagother.php:233
+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
+#, php-format
+msgid "Microblog tagged with %s"
+msgstr ""
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+msgid "Not found."
+msgstr ""
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:126
+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
+#, 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 ""
+
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:71
+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 ""
+
+#: classes/Notice.php:104
+msgid "Problem saving notice. Unknown user."
+msgstr ""
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: 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"
+msgstr ""
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+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 ""
+
+#: 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/action.php:341
+msgid "Login with OpenID"
+msgstr ""
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "�움�"
+
+#: lib/action.php:362
+msgid "Site notice"
+msgstr ""
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+msgid "Page notice"
+msgstr ""
+
+#: lib/action.php:562
+msgid "Secondary site navigation"
+msgstr ""
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+msgid "All "
+msgstr ""
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+msgid "Block this user"
+msgstr ""
+
+#: lib/blockform.php:153
+msgid "Block"
+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/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr ""
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
+
+#: lib/galleryaction.php:137
+msgid "Tag"
+msgstr ""
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+msgid "URL of the homepage or blog of the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:151
+msgid "Description"
+msgstr ""
+
+#: lib/groupeditform.php:153
+msgid "Describe the group or topic in 140 chars"
+msgstr ""
+
+#: lib/groupeditform.php:158
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "로그아웃"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+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
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "홈페�지 주소형�� 올바르지 않습니다."
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "로그�"
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr ""
+
+#: lib/logingroupnav.php:76
+msgid "Login with a username and password"
+msgstr ""
+
+#: lib/logingroupnav.php:79
+msgid "Sign up for a new account"
+msgstr ""
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, php-format
+msgid "%1$s is now listening to "
+msgstr ""
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "위치"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "홈페�지"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
+
+#: lib/mail.php:555
+#, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr ""
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
+msgstr ""
+
+#: lib/messageform.php:110
+msgid "Send a direct notice"
+msgstr ""
+
+#: lib/noticeform.php:125
+msgid "Send a notice"
+msgstr ""
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6글� ��"
+
+#: lib/noticelist.php:426
+msgid "in reply to"
+msgstr ""
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
+msgstr ""
+
+#: lib/noticelist.php:451
+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 ""
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr ""
+
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr ""
+
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr ""
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr ""
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
+msgstr ""
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90
+msgid "Popular"
+msgstr ""
+
+#: lib/searchgroupnav.php:82
+msgid "Notice"
+msgstr ""
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr ""
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, php-format
+msgid "People %s subscribes to"
+msgstr ""
+
+#: lib/subgroupnav.php:89
+#, php-format
+msgid "People subscribed to %s"
+msgstr ""
+
+#: lib/subgroupnav.php:97
+#, 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 ""
+
+#: lib/subs.php:53
+msgid "User has blocked you."
+msgstr ""
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr ""
+
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr ""
+
+#: lib/topposterssection.php:74
+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 "�메� 주소"
diff --git a/locale/laconica.pot b/locale/laconica.po
index f49d2cdad..d3c1dc809 100644
--- a/locale/laconica.pot
+++ b/locale/laconica.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\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"
@@ -17,12 +17,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
 #, 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 ""
@@ -33,11 +35,12 @@ 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 ""
 
-#: ../actions/invite.php:168 actions/invite.php:176
+#: ../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 ""
@@ -73,7 +76,7 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#: ../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 ""
@@ -90,22 +93,25 @@ msgid ""
 msgstr ""
 
 #: ../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 ""
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
+#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
 #, php-format
 msgid "%s Public Stream"
 msgstr ""
@@ -113,26 +119,31 @@ 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 ""
 
 #: ../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:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
 msgid "%s status"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -143,14 +154,14 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273
+#: ../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 ""
 
-#: ../lib/util.php:259 lib/util.php:275
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
@@ -161,6 +172,8 @@ 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 ""
 
@@ -169,14 +182,17 @@ 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
 msgid "6 or more characters, and don't forget it!"
 msgstr ""
 
 #: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
 msgid "6 or more characters. Required."
 msgstr ""
 
@@ -209,7 +225,15 @@ msgstr ""
 #: 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/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 ""
 
@@ -227,15 +251,21 @@ msgstr ""
 #: 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/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 ""
 
-#: ../lib/util.php:324 lib/util.php:340
+#: ../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 ""
 
@@ -243,38 +273,47 @@ msgstr ""
 #: ../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/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 ""
 
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
 msgstr ""
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
+#: 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: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 ""
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr ""
@@ -283,18 +322,22 @@ msgstr ""
 #: ../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: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 ""
 
@@ -309,11 +352,13 @@ msgid ""
 msgstr ""
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34
+#: 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 ""
 
@@ -331,6 +376,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
+#: actions/smssettings.php:111
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
@@ -340,64 +386,77 @@ 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 ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+#: ../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 ""
 
 #: ../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:121 lib/openid.php:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
 msgstr ""
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
 msgid "Cannot normalize that email address"
 msgstr ""
 
 #: ../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"
 msgstr ""
 
 #: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr ""
 
-#: ../lib/settingsaction.php:94
+#: ../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 ""
 
@@ -405,24 +464,31 @@ msgstr ""
 #: ../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/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
 msgid "Confirmation code"
 msgstr ""
 
 #: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr ""
 
@@ -446,59 +512,66 @@ msgid ""
 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/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr ""
 
-#: ../lib/openid.php:178 lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
 #, 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."
 msgstr ""
 
-#: ../lib/openid.php:160 lib/openid.php:160
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
 #, php-format
 msgid "Could not redirect to server: %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 ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
+#: ../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: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:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
@@ -506,43 +579,52 @@ msgstr ""
 #: ../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: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."
 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: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 ""
 
@@ -554,34 +636,46 @@ msgstr ""
 #: 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 ""
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+#: actions/emailsettings.php:99
 msgid "Current confirmed email address."
 msgstr ""
 
@@ -589,164 +683,186 @@ msgstr ""
 msgid "Currently"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
 #: ../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 ""
 
 #: ../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: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: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: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 ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
+#: ../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 ""
 
 #: ../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:153 actions/finishremotesubscribe.php:166
 msgid "Error inserting avatar"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
+#: 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: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: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: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/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: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/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/allrss.php:64 actions/all.php:75 actions/allrss.php:107
 #, php-format
 msgid "Feed for friends of %s"
 msgstr ""
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66
+#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
+#: actions/repliesrss.php:71
 #, php-format
 msgid "Feed for replies to %s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
 #, 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 ""
 
@@ -758,50 +874,66 @@ 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 ""
 
-#: ../lib/util.php:322 lib/util.php:338
+#: ../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/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 ""
 
 #: ../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/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."
@@ -821,18 +953,22 @@ 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 ""
 
-#: ../actions/login.php:67 actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
 msgid "Incorrect username or password."
 msgstr ""
 
@@ -843,78 +979,90 @@ msgid ""
 msgstr ""
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
 #, php-format
 msgid "Invalid email address: %s"
 msgstr ""
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr ""
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr ""
 
 #: ../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 ""
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr ""
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr ""
 
 #: ../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:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
 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: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: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/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:123 actions/invite.php:130 actions/invite.php:104
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, php-format
 msgid ""
 "It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
@@ -923,6 +1071,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: actions/imsettings.php:296
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
@@ -934,31 +1083,45 @@ msgid ""
 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)."
 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 ""
 
 #: ../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 ""
@@ -971,15 +1134,17 @@ msgid ""
 "%). "
 msgstr ""
 
-#: ../lib/util.php:308 lib/util.php:324
+#: ../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:110 actions/login.php:110 actions/login.php:245
+#: lib/facebookaction.php:320
 msgid "Lost or forgotten password?"
 msgstr ""
 
@@ -989,15 +1154,17 @@ 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%%."
 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:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr ""
@@ -1011,33 +1178,39 @@ 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 ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
+#: ../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: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 ""
 
@@ -1048,12 +1221,19 @@ 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 ""
 
@@ -1061,131 +1241,160 @@ msgstr ""
 #: ../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 ""
 
 #: ../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/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: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/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
+#: 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/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: 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
 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/twitapistatuses.php:520 actions/twitapifavorites.php:112
+#: actions/twitapistatuses.php:446
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
 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: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: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 ""
 
@@ -1204,11 +1413,21 @@ msgstr ""
 #: 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
+#: 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 ""
 
@@ -1217,67 +1436,79 @@ 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: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 ""
 
-#: ../lib/openid.php:131 lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr ""
 
 #: ../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: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 ""
 
 #: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+#: actions/remotesubscribe.php:152
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:143
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:309
 msgid "Not found"
 msgstr ""
 
@@ -1288,144 +1519,175 @@ msgstr ""
 #: 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
+#: 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: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 ""
 
 #: ../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:81 actions/tag.php:41
 #, 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/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
+#: lib/logingroupnav.php:81
 msgid "OpenID"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73
 msgid "OpenID Account Setup"
 msgstr ""
 
-#: ../lib/openid.php:180 lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
 msgid "OpenID Login"
 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/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/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:133 lib/openid.php:133 lib/openid.php:142
 #, 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:135 actions/invite.php:143 actions/invite.php:180
 msgid "Optionally add a personal message to the invitation."
 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/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 ""
 
 #: ../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/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/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"
 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/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:133 actions/invite.php:141 actions/invite.php:178
 msgid "Personal message"
 msgstr ""
 
@@ -1441,66 +1703,79 @@ msgid ""
 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/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/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"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344
+#: ../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: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/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:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr ""
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1510,44 +1785,55 @@ 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/register.php:200 actions/register.php:214
+#: actions/register.php:67
 msgid "Registration successful"
 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/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414
 msgid "Remember me"
 msgstr ""
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr ""
 
@@ -1557,11 +1843,15 @@ msgstr ""
 #: 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/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/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr ""
 
@@ -1571,45 +1861,54 @@ msgid ""
 "remove it, add another OpenID first."
 msgstr ""
 
-#: ../lib/stream.php:55 lib/personal.php:55
+#: ../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 ""
 
 #: ../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 ""
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
 msgid "SMS Phone number"
 msgstr ""
 
 #: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
 msgid "SMS confirmation"
 msgstr ""
 
 #: ../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 ""
 
@@ -1617,20 +1916,27 @@ msgstr ""
 #: ../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/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/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 ""
 
 #: ../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 "
@@ -1645,24 +1951,29 @@ msgid ""
 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
+#: 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 ""
 
@@ -1676,11 +1987,12 @@ msgstr ""
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../lib/util.php:304 lib/util.php:320
+#: ../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 ""
 
@@ -1689,66 +2001,83 @@ 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 ""
 
 #: ../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/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 ""
 
 #: ../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
+#: 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 ""
 
@@ -1757,18 +2086,22 @@ 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 ""
 
 #: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr ""
 
 #: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
 msgstr ""
 
@@ -1777,52 +2110,64 @@ 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/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
 msgid "That is already your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
 msgid "That is already your phone number."
 msgstr ""
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr ""
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:62
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
@@ -1834,6 +2179,8 @@ 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 ""
 
@@ -1869,7 +2216,7 @@ msgstr ""
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
+#: ../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 ""
@@ -1885,6 +2232,7 @@ msgid ""
 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 "
@@ -1894,14 +2242,17 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
+#: 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/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 ""
 
@@ -1910,10 +2261,12 @@ msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138
 msgid "Timezone"
 msgstr ""
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
 msgid "Timezone not selected."
 msgstr ""
 
@@ -1926,15 +2279,18 @@ msgid ""
 msgstr ""
 
 #: ../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 ""
 
@@ -1942,20 +2298,24 @@ msgstr ""
 #: ../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/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
+#: ../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:60 actions/finishremotesubscribe.php:61
 msgid "Unknown version of OMB protocol."
 msgstr ""
 
@@ -1966,42 +2326,51 @@ msgid ""
 msgstr ""
 
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
 #: ../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 ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr ""
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
 msgid "Updates by instant messenger (IM)"
 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 ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
 #, 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 ""
 
@@ -2017,7 +2386,7 @@ msgstr ""
 msgid "Upload a new profile image"
 msgstr ""
 
-#: ../actions/invite.php:114 actions/invite.php:121
+#: ../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 ""
@@ -2028,7 +2397,7 @@ msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
 msgid "User being listened to doesn't exist."
 msgstr ""
 
@@ -2042,10 +2411,16 @@ msgstr ""
 #: 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/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr ""
 
@@ -2054,35 +2429,42 @@ msgid "User not found."
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
 msgid "What timezone are you normally in?"
 msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %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\""
 msgstr ""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, 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
 msgid "Yes"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
+#: actions/finishaddopenid.php:112
 msgid "You already have this OpenID!"
 msgstr ""
 
@@ -2093,14 +2475,16 @@ msgid ""
 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:81 actions/invite.php:88 actions/invite.php:120
 msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2113,6 +2497,7 @@ msgid "You can create a new account to start posting notices."
 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 ""
@@ -2137,15 +2522,19 @@ 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 ""
 
@@ -2163,15 +2552,16 @@ msgid ""
 msgstr ""
 
 #: ../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: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/invite.php:103 actions/invite.php:110
+#: ../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!"
@@ -2182,6 +2572,7 @@ 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 ""
 
@@ -2196,47 +2587,47 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992
+#: ../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:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002
+#: ../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: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: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: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:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr ""
 
@@ -2247,21 +2638,23 @@ 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/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/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 ""
 
@@ -2278,18 +2671,22 @@ msgstr ""
 #: 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:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr ""
 
-#: actions/disfavor.php:63
+#: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr ""
 
-#: actions/disfavor.php:72
+#: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
 msgstr ""
 
@@ -2297,16 +2694,18 @@ msgstr ""
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: actions/emailsettings.php:95
+#: 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: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
+#: classes/Command.php:132 actions/favor.php:86
+#: actions/twitapifavorites.php:125 classes/Command.php:152
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2315,85 +2714,91 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: actions/inbox.php:28
+#: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
 msgstr ""
 
-#: actions/inbox.php:30
+#: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 msgstr ""
 
-#: actions/inbox.php:53
+#: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: actions/invite.php:178
+#: 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/login.php:104
+#: 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:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: 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 ""
 
-#: actions/newmessage.php:65
+#: 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
+#: 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
+#: 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/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
 msgstr ""
 
-#: actions/openidsettings.php:28
+#: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: actions/openidsettings.php:46
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
@@ -2401,64 +2806,67 @@ msgstr ""
 msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: actions/openidsettings.php:87
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: actions/outbox.php:28
+#: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: actions/outbox.php:30
+#: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr ""
 
-#: actions/outbox.php:53
+#: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: actions/peoplesearch.php:28
+#: 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/profilesettings.php:27
+#: 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:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
 msgstr ""
 
-#: actions/recoverpassword.php:141
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: actions/recoverpassword.php:154
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
 msgstr ""
 
-#: actions/recoverpassword.php:169
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
 msgstr ""
 
-#: actions/recoverpassword.php:271
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
 msgstr ""
 
-#: actions/recoverpassword.php:327
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -2473,21 +2881,22 @@ msgstr ""
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: 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:61 actions/showfavorites.php:145
 #, php-format
 msgid "Feed for favorites of %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 ""
 
-#: actions/showmessage.php:33
+#: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
 msgstr ""
 
@@ -2495,12 +2904,12 @@ msgstr ""
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: actions/showmessage.php:61
+#: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: actions/showmessage.php:66
+#: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
@@ -2509,58 +2918,63 @@ msgstr ""
 msgid "Send a message"
 msgstr ""
 
-#: actions/smssettings.php:312
+#: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #, 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."
 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/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
 msgid "%s updates favorited by %s / %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 ""
 
 #: 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"
@@ -2572,15 +2986,15 @@ msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2588,7 +3002,7 @@ msgstr ""
 msgid "Twitter Username"
 msgstr ""
 
-#: actions/twittersettings.php:65
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgid "No spaces, please."
 msgstr ""
 
@@ -2596,15 +3010,15 @@ msgstr ""
 msgid "Twitter Password"
 msgstr ""
 
-#: actions/twittersettings.php:72
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: actions/twittersettings.php:75
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: actions/twittersettings.php:78
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
@@ -2614,7 +3028,7 @@ msgid ""
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -2624,160 +3038,166 @@ 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!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: 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: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:245 actions/twittersettings.php:461
 msgid "Twitter preferences saved."
 msgstr ""
 
-#: actions/userauthorization.php:84
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
 msgstr ""
 
-#: actions/userauthorization.php:324
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: actions/userauthorization.php:334
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:204
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:215
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39
+#: classes/Command.php:39 classes/Command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: classes/Command.php:96
+#: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: 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:146 classes/Command.php:166
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166
+#: classes/Command.php:166 classes/Command.php:189
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: classes/Command.php:169
+#: classes/Command.php:169 classes/Command.php:192
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
-#: classes/Command.php:172
+#: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
-#: classes/Command.php:175
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178
+#: classes/Command.php:178 classes/Command.php:201
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:228
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:300
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:307
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: 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:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: 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:313 classes/Command.php:356
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:358
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:379
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:381
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53
+#: classes/Message.php:53 classes/Message.php:56
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63
+#: classes/Message.php:63 classes/Message.php:66
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -2785,74 +3205,1449 @@ msgstr ""
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:289
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:508
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:512
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43
+#: 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:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: lib/personal.php:65
+#: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
 msgstr ""
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
 msgstr ""
 
-#: lib/personal.php:75
+#: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
 msgstr ""
 
-#: lib/personal.php:76
+#: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
 msgstr ""
 
-#: lib/personal.php:80
+#: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
 msgstr ""
 
-#: lib/personal.php:81
+#: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgid "To"
 msgstr ""
 
-#: scripts/maildaemon.php:45
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, php-format
+msgid "%s and friends, page %d"
+msgstr ""
+
+#: 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 ""
+
+#: 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
+#, php-format
+msgid "The address \"%s\" has been "
+msgstr ""
+
+#: actions/deletenotice.php:73
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
+#, 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"
+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 ""
+
+#: 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 ""
+
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+msgid "Nickname must have only lowercase letters "
+msgstr ""
+
+#: actions/editgroup.php:198 actions/newgroup.php:149
+msgid "description is too long (max 140 chars)."
+msgstr ""
+
+#: actions/editgroup.php:218
+msgid "Could not update group."
+msgstr ""
+
+#: actions/editgroup.php:226
+msgid "Options saved."
+msgstr ""
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr ""
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
+msgstr ""
+
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
+msgstr ""
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+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. "
+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 ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, php-format
+msgid "Allow %s to update my Facebook status"
+msgstr ""
+
+#: actions/facebookhome.php:218
+msgid "Skip"
+msgstr ""
+
+#: actions/facebookhome.php:235
+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 ""
+
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
+msgstr ""
+
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
+msgstr ""
+
+#: actions/facebookinvite.php:105
+#, php-format
+msgid "Invite your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, 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."
+msgstr ""
+
+#: actions/facebooksettings.php:106
+msgid "Prefix"
+msgstr ""
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, 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
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.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
+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/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
+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
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+msgstr ""
+
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+msgid "Create a new group"
+msgstr ""
+
+#: actions/groupsearch.php:57
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+msgstr ""
+
+#: actions/groupsearch.php:63
+msgid "Group search"
+msgstr ""
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
+msgstr ""
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+msgid "Send me replies through Jabber/GTalk "
+msgstr ""
+
+#: actions/imsettings.php:321
+#, 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 ""
+
+#: actions/joingroup.php:128
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr ""
+
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
+msgstr ""
+
+#: 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 ""
+
+#: actions/leavegroup.php:138
+#, php-format
+msgid "Could not remove user %s to group %s"
+msgstr ""
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: 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 ""
+
+#: 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/openidlogin.php:97
+msgid "OpenID login"
+msgstr ""
+
+#: actions/openidsettings.php:128
+msgid "Removing your only OpenID "
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:91
+#, 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"
+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 ""
+
+#: actions/profilesettings.php:311
+msgid "Couldn't save tags."
+msgstr ""
+
+#: actions/public.php:107
+#, php-format
+msgid "Public timeline, page %d"
+msgstr ""
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/public.php:220
+#, 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"
+msgstr ""
+
+#: actions/publictagcloud.php:63
+#, 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 ""
+
+#: 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, "
+msgstr ""
+
+#: actions/register.php:471
+#, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr ""
+
+#: 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 ""
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
+msgstr ""
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
+
+#: actions/showgroup.php:206
+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"
+msgstr ""
+
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+msgid "Note"
+msgstr ""
+
+#: actions/showgroup.php:270
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, php-format
+msgid "Notice feed for %s group"
+msgstr ""
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+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 ""
+
+#: actions/showgroup.php:370
+msgid "All members"
+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 "
+msgstr ""
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
+msgstr ""
+
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
+msgstr ""
+
+#: actions/showstream.php:143
+msgid "'s profile"
+msgstr ""
+
+#: actions/showstream.php:236 actions/tagother.php:77
+msgid "User profile"
+msgstr ""
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+msgid "All subscribers"
+msgstr ""
+
+#: actions/showstream.php:533
+msgid "All groups"
+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 "
+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. "
+msgstr ""
+
+#: actions/smssettings.php:453
+msgid "Mobile carrier"
+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 ""
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr ""
+
+#: actions/subscribers.php:63
+msgid "These are the people who listen to "
+msgstr ""
+
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who "
+msgstr ""
+
+#: actions/subscriptions.php:52
+#, php-format
+msgid "%s subscriptions"
+msgstr ""
+
+#: actions/subscriptions.php:54
+#, php-format
+msgid "%s subscriptions, page %d"
+msgstr ""
+
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices "
+msgstr ""
+
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose "
+msgstr ""
+
+#: actions/subscriptions.php:122
+msgid "Jabber"
+msgstr ""
+
+#: actions/tag.php:43
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr ""
+
+#: actions/tag.php:66
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+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: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."
+msgstr ""
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:198
+msgid "Could not save tags."
+msgstr ""
+
+#: actions/tagother.php:233
+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
+#, php-format
+msgid "Microblog tagged with %s"
+msgstr ""
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+msgid "Not found."
+msgstr ""
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:126
+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
+#, 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 ""
+
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:71
+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 ""
+
+#: classes/Notice.php:104
+msgid "Problem saving notice. Unknown user."
+msgstr ""
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: 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"
+msgstr ""
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+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 ""
+
+#: 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/action.php:341
+msgid "Login with OpenID"
+msgstr ""
+
+#: lib/action.php:344
+msgid "Help me!"
+msgstr ""
+
+#: lib/action.php:362
+msgid "Site notice"
+msgstr ""
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+msgid "Page notice"
+msgstr ""
+
+#: lib/action.php:562
+msgid "Secondary site navigation"
+msgstr ""
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+msgid "All "
+msgstr ""
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+msgid "Block this user"
+msgstr ""
+
+#: lib/blockform.php:153
+msgid "Block"
+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/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr ""
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
+
+#: lib/galleryaction.php:137
+msgid "Tag"
+msgstr ""
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+msgid "URL of the homepage or blog of the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:151
+msgid "Description"
+msgstr ""
+
+#: lib/groupeditform.php:153
+msgid "Describe the group or topic in 140 chars"
+msgstr ""
+
+#: lib/groupeditform.php:158
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+msgid "Logo"
+msgstr ""
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+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 "
+msgstr ""
+
+#: lib/joinform.php:114
+msgid "Join"
+msgstr ""
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr ""
+
+#: lib/logingroupnav.php:76
+msgid "Login with a username and password"
+msgstr ""
+
+#: lib/logingroupnav.php:79
+msgid "Sign up for a new account"
+msgstr ""
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, php-format
+msgid "%1$s is now listening to "
+msgstr ""
+
+#: lib/mail.php:254
+#, php-format
+msgid "Location: %s\n"
+msgstr ""
+
+#: lib/mail.php:256
+#, php-format
+msgid "Homepage: %s\n"
+msgstr ""
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
+
+#: lib/mail.php:555
+#, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr ""
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
+msgstr ""
+
+#: lib/messageform.php:110
+msgid "Send a direct notice"
+msgstr ""
+
+#: lib/noticeform.php:125
+msgid "Send a notice"
+msgstr ""
+
+#: lib/noticeform.php:152
+msgid "Available characters"
+msgstr ""
+
+#: lib/noticelist.php:426
+msgid "in reply to"
+msgstr ""
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
+msgstr ""
+
+#: lib/noticelist.php:451
+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 ""
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr ""
+
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr ""
+
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr ""
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr ""
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
+msgstr ""
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90
+msgid "Popular"
+msgstr ""
+
+#: lib/searchgroupnav.php:82
+msgid "Notice"
+msgstr ""
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr ""
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, php-format
+msgid "People %s subscribes to"
+msgstr ""
+
+#: lib/subgroupnav.php:89
+#, php-format
+msgid "People subscribed to %s"
+msgstr ""
+
+#: lib/subgroupnav.php:97
+#, 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 ""
+
+#: lib/subs.php:53
+msgid "User has blocked you."
+msgstr ""
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr ""
+
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr ""
+
+#: lib/topposterssection.php:74
+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 ""
diff --git a/locale/mk_MK/LC_MESSAGES/laconica.mo b/locale/mk_MK/LC_MESSAGES/laconica.mo
index 8fa1d1997..7820a3f7c 100644
--- a/locale/mk_MK/LC_MESSAGES/laconica.mo
+++ b/locale/mk_MK/LC_MESSAGES/laconica.mo
diff --git a/locale/mk_MK/LC_MESSAGES/laconica.po b/locale/mk_MK/LC_MESSAGES/laconica.po
index 67538ce60..e864f8997 100644
--- a/locale/mk_MK/LC_MESSAGES/laconica.po
+++ b/locale/mk_MK/LC_MESSAGES/laconica.po
@@ -13,46 +13,86 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: NOVICA NAKOV <novica@slobodensoftver.org.mk>\n"
-"Language-Team: Macedonian <info@slobodensoftver.org.mk>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../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:193
+#: ../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."
+" 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/subscribe.php:84
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:347
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s �ега ги �леди вашите забелешки за %2$s."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -62,982 +102,1799 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
-"%1$s �ега ги �леди вашите забелешки на "
-"%2$s.\n"
+"%1$s �ега ги �леди вашите забелешки на %2$s.\n"
+"\n"
+"\t%3$s\n"
 "\n"
-"\t%3$s\n\nИ�крено ваш,\n%4$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 ""
 
-#: ../actions/shownotice.php:45
+#: ../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/publicrss.php:60
+#: ../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 ""
+
+#: ../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:70 ../lib/stream.php:45
+#: ../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 и пријателите"
 
-#: ../lib/util.php:233
+#: ../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
 #, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
-"**%%site.name%%** е �ерви� за микроблогирање што "
-"ви го овозможува [%%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:235
+#: ../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%%** е �ерви� за микроблогирање што ви го овозможува [%%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:250
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ". Придоне�увачите треба да бидат наведени �о цело име или прекар."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: 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/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
 msgstr "6 или повеќе знаци"
 
-#: ../actions/recoverpassword.php:165
+#: ../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/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"И�пративме код за потврда на IM адре�ата што ја додадовте. Мора да го "
+"одобрите %S за да ви и�праќа пораки."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"И�пративме код за потврда на IM адре�ата "
-"што ја додадовте. Мора да го одобрите %S за да ви и�праќа пораки."
 
-#: ../lib/util.php:296
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
 msgstr "За"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "Прифати"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "Додај OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92
 msgid "Address"
 msgstr "�дре�а"
 
-#: ../actions/showstream.php:254
+#: ../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:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
 #, php-format
 msgid "All updates for %s"
 msgstr "Сите новини од %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../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:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "Веќе �те претплатени!"
 
-#: ../actions/userauthorization.php:76
+#: ../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:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Следниот пат најавете �е автомат�ки; не "
-"за компјутери кои ги делите �о други!"
+"Следниот пат најавете �е автомат�ки; не за компјутери кои ги делите �о други!"
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
 
-#: ../actions/avatar.php:32
+#: ../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/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "�ватарот е ажуриран."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"Чекам потвдар за оваа адре�а. Проверете "
-"ја вашата Jabber/GTalk �метка за порака �о "
-"понатамошни ин�трукции. (Дали го додадовте %s на вашата ли�та �о пријатели?)"
+"Чекам потвдар за оваа адре�а. Проверете ја вашата 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:1136
+#: ../lib/util.php:1318 lib/util.php:1452
+#, fuzzy
 msgid "Before »"
 msgstr "Предходни »"
 
-#: ../actions/profilesettings.php:52
+#: ../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:93 ../actions/updateprofile.php:102
+#: ../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/updateprofile.php:118
+#: ../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:261
+#: ../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/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: 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:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "�е е возможно да �е ин�танцира OpenID објект за потрошувачка."
 
-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
 msgid "Cannot normalize that Jabber ID"
 msgstr "Ова JabberID не може да �е нормализира."
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "Промени"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Промени ја лозинката"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../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:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Потврди ја адре�ата"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "Потврдата е откажана"
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Кодот за потврда не е пронајден."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "Поврзи �е"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "Поврзи �е �о по�тоечка �метка"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "OpenID формуларот не може да �е креира:%s"
 
-#: ../lib/openid.php:160
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow 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:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166
 msgid "Could not save avatar info"
 msgstr "Информациите за аватарот не може да �е �нимат"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159
 msgid "Could not save new profile info"
 msgstr "Информациите за новиот профил не може да �е �нимат"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-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/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "�е може да �е креира претплатата"
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: actions/confirmaddress.php:126 actions/emailsettings.php:375
+#: actions/imsettings.php:357 actions/smssettings.php:370
 msgid "Couldn't delete email confirmation."
 msgstr "�е може да �е креира потврда за е-пошта."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
 msgstr "Претплата не може да �е избрише."
 
-#: ../actions/remotesubscribe.php:125
+#: ../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."
 msgstr "�е може да �е земе белег за барање."
 
-#: ../actions/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: 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:175
+#: ../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/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Креирај"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "Креирај нова �метка"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../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:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Моментално потврдена Jabber/GTalk адре�а."
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../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 "Моментално"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %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/profilesettings.php:54
+#: ../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:181
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "Е-пошта"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-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/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
 msgid "Email address already exists."
 msgstr "�дре�ата веќе по�тои."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
 msgstr "Потврдување на адре�ата"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../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/userauthorization.php:136
+#: ../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:282
+#: ../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: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/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Грешка во вне�увањето на изве�тувањето"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
 msgid "Error inserting remote profile"
 msgstr "Грешка во вне�увањето на оддалечениот профил"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
 msgstr "Грешка во �нимањето на потвдата за адре�ата."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
 msgid "Error saving remote profile"
 msgstr "Грешка во �нимањето на оддалечениот профил"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../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:237 lib/openid.php:246
 msgid "Error saving the user."
 msgstr "Грешка во �нимањето на кори�никот."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164
 msgid "Error saving user; invalid."
 msgstr "Грешка во �нимањето на кори�никот; неправилен."
 
-#: ../actions/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 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: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:79
+#: ../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:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "По�тоечки прекар"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "ЧПП"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "Товарањето на аватарот не у�пеа."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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:61 ../actions/repliesrss.php:80
+#: ../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/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, 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
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Поради безбедно�ни причини треба "
-"повторно да го вне�ете Вашето кори�ничко име и лозинка пред да ги �мените Вашите по�тавки."
+"Поради безбедно�ни причини треба повторно да го вне�ете Вашето кори�ничко "
+"име и лозинка пред да ги �мените Вашите по�тавки."
 
-#: ../actions/profilesettings.php:44
+#: ../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:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "Помош"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "Дома"
 
-#: ../actions/profilesettings.php:49
+#: ../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:87
+#: ../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/imsettings.php:61
+#: ../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 "IM адре�а"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "По�тавки за IM"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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."
+"�ко веќе имае �метка, пријавете �е �о Вашето кори�ничко име и лозика, за "
+"и�тата да ја поврзете �о Вашиот OpenID."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"�ко �акате да додадете OpenID на Вашата "
-"�метка, вне�ете го подолу и кликнете „Додај“."
+"�ко �акате да додадете OpenID на Вашата �метка, вне�ете го подолу и кликнете "
+"„Додај“."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"�ко �те ја заборавиле или загубиле "
-"лозинката, можете да добиете нова на адре�ата што ја вне�овте во Вашата �метка."
 
-#: ../actions/password.php:69
+#: ../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 "�еточна �тара лозинка"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
 msgid "Incorrect username or password."
 msgstr "�еточно кори�ничко име или лозинка"
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Упат�твото за пронаоѓање на Вашата "
-"лозинка е и�пратено до адре�ата за е-пошта што е реги�трирана �о Вашата �метка."
+"Упат�твото за пронаоѓање на Вашата лозинка е и�пратено до адре�ата за е-"
+"пошта што е реги�трирана �о Вашата �метка."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "�еправилно URL за аватар: '%s'"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "�евалидна домашна �траница: '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../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:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
 msgid "Invalid notice content"
 msgstr "�еправилна �одржина за изве�тување"
 
-#: ../actions/postnotice.php:67
+#: ../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:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "�еправилно url на изве�тување"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "�еправилно URL на профил: '%s'"
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135
 msgid "Invalid profile URL (bad format)"
 msgstr "�еправилно URL на профил (лош формат)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
 msgstr "�еправилно URL на профил вратено од �ерверот"
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Погрешна големина."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
 msgid "Invalid username or password."
 msgstr "Погрешно име или лозинка."
 
-#: ../lib/util.php:237
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Работи на [Laconica](http://laconi.ca/) �офтверот за "
-"микроблогирање, верзија %s, до�тапен пд [GNU "
-"Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Работи на [Laconica](http://laconi.ca/) �офтверот за микроблогирање, верзија "
+"%s, до�тапен пд [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../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:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
-"Jabber или GTalk адре�а како „ime@example.org“. �о "
-"прво додајте го %s во Вашата контакт ли�та во Вашиот IM клиент или GTalk."
+"Jabber или GTalk адре�а како „ime@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 ""
 
-#: ../actions/profilesettings.php:55
+#: ../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:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Пријавете �е �о [OpenID](%%doc.openid%%) �метка."
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
-"Пријавете �е �о кори�ничко име и лозинка. "
-"�емате? [Реги�трирајте](%%action.register%%) нова �метка или пробајте [OpenID](%%action.openidlogin%%). "
+"Пријавете �е �о кори�ничко име и лозинка. �емате? [Реги�трирајте](%%action."
+"register%%) нова �метка или пробајте [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Одјави �е"
 
-#: ../actions/login.php:106
+#: ../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 "Загубена или заборавена лозинка?"
 
-#: ../actions/showstream.php:281
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php: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 "Член од"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "Микроблог на %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/finishopenidlogin.php:107 actions/register.php:429
 msgid "My text and files are available under "
 msgstr "Мојот тек�т и датотеки �е до�тапни под"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../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 ""
+
+#: ../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:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "�ово изве�тување"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "�овата лозинка у�пешно е �нимена. Сега �те пријавени."
 
-#: ../actions/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../actions/login.php:101 ../actions/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:99
-#: ../actions/register.php:59
+#: ../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:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
 msgstr "Тој прекар не е дозволен."
 
-#: ../actions/remotesubscribe.php:72
+#: ../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:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "Прекар или е-пошта"
 
-#: ../actions/imsettings.php:147
+#: ../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 "�ема JabberID."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "�ема барање за проверка!"
 
-#: ../actions/confirmaddress.php:33
+#: ../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:49
+#: ../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/userbyid.php:27
+#: ../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:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
 msgstr "�ема прекар."
 
-#: ../actions/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: 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:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+#: actions/recoverpassword.php:266
 msgid "No registered email address for that user."
 msgstr "�ема реги�трирана адре�а за е-пошта за тој кори�ник."
 
-#: ../actions/userauthorization.php:48
+#: ../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:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "�ема големина."
 
-#: ../actions/openidsettings.php:135
+#: ../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/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+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 "�ема таков OpenID."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "�ема таков документ."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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:56
+#: actions/recoverpassword.php:62
 msgid "No such recovery code."
 msgstr "�ема таков код за �па�ување."
 
-#: ../actions/postnotice.php:56
+#: ../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:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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 "�ема таков кори�ник."
 
-#: ../lib/gallery.php:76
+#: ../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:60
+#: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr "Ова не е код за �па�ување."
 
-#: ../actions/imsettings.php:158
+#: ../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 "�еправилен JabberID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "�еправилен OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../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:83 ../actions/register.php:61
+#: ../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:118
+#: ../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:111
+#: ../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:104 actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:143
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "�еправилно URL на профил (нема YADIS документ)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
 msgstr "�е е �лика или датотеката е корумпирана."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "�е е одобрено."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "Овој одговор не беше очекуван!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/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/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "�е �те претплатени!"
 
-#: ../actions/showstream.php:82
+#: ../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:39
+#: actions/shownotice.php:94
 msgid "Notice has no profile"
 msgstr "Изве�тувањето нема профил"
 
-#: ../actions/showstream.php:297
+#: ../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/password.php:39
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "Стара лозинка"
 
-#: ../lib/util.php:288
+#: ../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: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:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
 msgstr "�втомат�ко и�праќање на OpenID"
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: 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:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "�еу�пех на OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "По�тавки за OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "Парцијално товарање"
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:335
 msgid "Password and confirmation do not match."
 msgstr "Двете лозинки не �е �овпаѓаат."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+#: actions/recoverpassword.php:331
 msgid "Password must be 6 chars or more."
 msgstr "Лозинката мора да биде од најмалку 6 знаци."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
 msgid "Password recovery requested"
 msgstr "Побарано е пронаоѓање на лозинката"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../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/password.php:61 ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../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"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Пребарување на луѓе"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "Личен"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/userauthorization.php:78
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"Проверете ги овие детали ако �акате да �е "
-"претплатите на изве�тувањата на овој кори�ник. �ко не �акате да �е претплатите, кликнете на „Откажи“."
+"Проверете ги овие детали ако �акате да �е претплатите на изве�тувањата на "
+"овој кори�ник. �ко не �акате да �е претплатите, кликнете на „Откажи“."
 
-#: ../actions/imsettings.php:74
+#: ../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/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "Преференции"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "Преференциите �е �нимени."
 
-#: ../lib/util.php:300
+#: ../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 "Приватно�т"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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/stream.php:54
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "URL на профилот"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
 msgstr "По�тавки на профилот"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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 "�епознат профил"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Јавен"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Јавен канал"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "Јавна и�торија"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr "Пронајди"
 
-#: ../actions/recoverpassword.php:141
+#: ../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:67
+#: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr "Код за пронаоѓање за непознат кори�ник."
 
-#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: actions/register.php:69 actions/register.php:436 lib/action.php:338
+#: lib/facebookaction.php:277 lib/logingroupnav.php:78
 msgid "Register"
 msgstr "Реги�трирај �е"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "Одбиј"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414
 msgid "Remember me"
 msgstr "Запамети ме"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
 msgstr "Оддалечениот профил нема одговарачки профил"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "Оддалечена претплата"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "От�трани го OpenID-то"
 
@@ -1046,50 +1903,92 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"�ко го о�траните Вашето един�твено OpenID, "
-"тогаш нема да можете да �е пријавите. �ко треба да го от�траните, прво додајте друг OpenID."
+"�ко го о�траните Вашето един�твено OpenID, тогаш нема да можете да �е "
+"пријавите. �ко треба да го от�траните, прво додајте друг OpenID."
 
-#: ../lib/stream.php:49
+#: ../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:50
+#: ../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:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "Ре�етирај"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "Ре�тетирај ја лозинката"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
 msgid "Same as password above"
 msgstr "И�то како лозинката погоре"
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../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:73 ../lib/util.php:277
+#: ../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:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "Барај во каналот"
 
-#: ../actions/noticesearch.php:30
+#: ../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 знаци."
+"Барајте изве�тувања на %%site.name%% �поред нивната �одржина. Термините "
+"одделете ги �о празни ме�та. �ајмала должина е 3 знаци."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1097,154 +1996,286 @@ msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Барајте луѓе на %%site.name%% �поред нивното "
-"име, локација или интере�и. Термините одделете ги �о празни ме�та. �ајмала должина е 3 знаци."
+"Барајте луѓе на %%site.name%% �поред нивното име, локација или интере�и. "
+"Термините одделете ги �о празни ме�та. �ајмала должина е 3 знаци."
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: actions/smssettings.php:457
+msgid "Select a carrier"
+msgstr ""
 
-#: ../lib/util.php:982
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
+#: lib/messageform.php:167 lib/noticeform.php:177
 msgid "Send"
 msgstr "И�прати"
 
-#: ../actions/imsettings.php:71
+#: ../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."
 
-#: ../lib/util.php:282
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr "По�тавки"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "По�тавките �е �нимени."
 
-#: ../actions/finishaddopenid.php:66
+#: ../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 "�ешто чудно �е �лучи."
 
-#: ../lib/util.php:302
+#: ../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:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "Стати�тика"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../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:172
-#: ../actions/showstream.php:181
+#: ../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:294 ../actions/subscribers.php:27
+#: ../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:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "Претплатата е одобрена"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "Претплатата е одбиена"
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/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/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
 msgid "System error uploading file."
 msgstr "Си�тем�ка грешка при товарањето на датотеката."
 
-#: ../actions/noticesearch.php:34
+#: ../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: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:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "Оваа адре�а веќе е потврдена."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
 msgstr "Овој код за потврда не е за Ва�!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "Датотеката е преголема."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr "Ова веќе е Вашиот Jabber ID."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr "Ова не е Вашиот Jabber ID."
 
-#: ../actions/imsettings.php:201
+#: ../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/newnotice.php:52
+#: ../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/confirmaddress.php:86
+#: ../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/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "�дре�ата  \"%s\" е потврдена за Вашата �метка."
 
-#: ../actions/imsettings.php:241
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413
 msgid "The address was removed."
 msgstr "�дре�ата е от�транета."
 
-#: ../actions/userauthorization.php:311
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"Претплатата е одобрена, но нема вратено "
-"URL. Проверете ги ин�трукциите за ме�тото "
-"за да видите како да ја одобрите претплатата. Вашиот белег за претплата е:"
+"Претплатата е одобрена, но нема вратено URL. Проверете ги ин�трукциите за "
+"ме�тото за да видите како да ја одобрите претплатата. Вашиот белег за "
+"претплата е:"
 
-#: ../actions/userauthorization.php:321
+#: ../actions/userauthorization.php:322
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"Претплатата е одбиена, но нема вратено URL. "
-"Проверете ги ин�трукциите за ме�тото за да видите како цело�но да ја одбиете претплатата."
+"Претплатата е одбиена, но нема вратено URL. Проверете ги ин�трукциите за "
+"ме�тото за да видите како цело�но да ја одбиете претплатата."
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Ова �е луѓето што ги �ледат изве�тувањата на %s."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Ова �е луѓето што ги �ледат Вашите изве�тувања."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Ова �е луѓето чии изве�тувања ги �леди %s."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Ова �е луѓето чии изве�тувања ги �ледите."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/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/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
 msgstr "Овој код за потврда е премногу �тар. Почнете од почеток."
 
@@ -1253,83 +2284,158 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Овој формулар треба автомат�ки да �е "
-"и�прати. �ко тоа не �е �лучи, кликнете на копчето „И�прати“ за да одите до Вашиот OpenID �набдувач."
+"Овој формулар треба автомат�ки да �е и�прати. �ко тоа не �е �лучи, кликнете "
+"на копчето „И�прати“ за да одите до Вашиот OpenID �набдувач."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../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 �о "
-"локална �метка. Можете да креирате нова �метка или да �е поврзете �о тековната �метка - ако ја имате."
+"Ова е прв пат како �е пријавивте на %s и затоа морам да го поврземе Вашиот "
+"OpenID �о локална �метка. Можете да креирате нова �метка или да �е поврзете "
+"�о тековната �метка - ако ја имате."
 
-#: ../lib/util.php:147
+#: ../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"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+"За да �е претплатите, може да �е [пријавите](%%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 ""
-"За да �е претплатите, може да �е "
-"[пријавите](%%action.login%%) или  да �е "
-"[реги�трирате](%%action.register%%). �ко имате "
-"�метка на [компатибилно ме�то за микро блогирање](%%doc.openmublog%%), вне�ете го URL-то на Вашиот профил подолу."
 
-#: ../actions/profilesettings.php:51
+#: ../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:74 actions/remotesubscribe.php:83
+#: actions/remotesubscribe.php:110
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL на Вашиот профил на друго компатибилно ме�то за микроблогирање."
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/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:237
+#: ../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:245
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
-"О�вен ако не е поинаку назначено, "
-"�одржината на ова ме�то е автор�ко право на придоне�увачите и е до�тапна под"
+"О�вен ако не е поинаку назначено, �одржината на ова ме�то е автор�ко право "
+"на придоне�увачите и е до�тапна под"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "�епознат тип на адре�а %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Откажи ја претплатата"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../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/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr "�еподдржан фомрат на �лики."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "Товари"
 
@@ -1340,114 +2446,215 @@ msgid ""
 "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/profilesettings.php:48 ../actions/register.php:182
+#: ../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:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../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/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "Прекар на кори�никот"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
 msgstr "Што има %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../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/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Погрешен тип на �лика за '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Погрешна големина на �лика на '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../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/recoverpassword.php:31
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Овде можете да ја промените лозинката. Одберете добра лозинка!"
 
-#: ../actions/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Можете да креирате нова �метка за да и�праќате изве�тувања."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Можте да от�траните OpenID од Вашата �метка "
-"�о кликање на копчето „От�трани“."
+"Можте да от�траните OpenID од Вашата �метка �о кликање на копчето „От�трани“."
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"Можете да примате и праќате изве�тувања "
-"преку Jabber/GTalk [брзи пораки](%%doc.im%%). Подолу "
+"Можете да примате и праќате изве�тувања преку Jabber/GTalk [брзи пораки](%%"
+"doc.im%%). Подолу "
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"Во Вашиот личен профил може да дополните "
-"информации за луѓето да знаат повеќе за Ва�."
+"Во Вашиот личен профил може да дополните информации за луѓето да знаат "
+"повеќе за Ва�."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: 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:51
+#: ../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:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67
 msgid "You did not send us that profile"
 msgstr "�е ни го и�пративте тој профил."
 
-#: ../actions/recoverpassword.php:134
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "Вашето URL за OpenID"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Вашиот прекар на овој �ервер или адре�ата "
-"за е-пошта �о која �е реги�триравте."
+"Вашиот прекар на овој �ервер или адре�ата за е-пошта �о која �е "
+"реги�триравте."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -1455,1373 +2662,2205 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"[OpenID](%%doc.openid%%) Ви овозможува да �е "
-"пријавувате на многу ме�та �о и�тата "
-"кори�ничка �метка. Овде можете да ги уредите Вашите поврзани OpenID-ја."
+"[OpenID](%%doc.openid%%) Ви овозможува да �е пријавувате на многу ме�та �о "
+"и�тата кори�ничка �метка. Овде можете да ги уредите Вашите поврзани OpenID-"
+"ја."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "пред неколку �екунди"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "пред %d денови"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "пред %d ча�а"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr "пред %d минути"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr "пред %d ме�еци"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "пред еден ден"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "пред една минута"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "пред еден ме�ец"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "пред една година"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "пред еден ча�"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "одговор"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "и�то како лозинката погоре"
 
-#: ../lib/util.php:1127
+#: ../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 "« Следни"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
+#: 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/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: 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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
+msgid "%s favorite notices"
 msgstr ""
 
-#: ../actions/invite.php:168 actions/invite.php:176
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
+msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+#: 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:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
+#: actions/login.php:122 actions/login.php:264
+msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
+#: actions/login.php:126 actions/login.php:268
+msgid "Login with your username and password. "
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
+#: 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/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
+#: 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/register.php:213
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+msgid "No such user"
 msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
+#: actions/newmessage.php:117 actions/newmessage.php:67
+msgid "New message"
 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/noticesearch.php:95 actions/noticesearch.php:146
+msgid "Notice without matching profile"
 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/openidsettings.php:28 actions/openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+#: actions/outbox.php:53 actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+"Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
+msgid "You can update your personal profile info here "
 msgstr ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
+#: 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/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+msgid "This confirmation code is too old. "
 msgstr ""
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
 msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
 msgstr ""
 
-#: ../actions/register.php:202
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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...\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."
+"want to..."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: 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 "Could not follow user: %s is already on your list."
+msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
 msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
+#: actions/showstream.php:154
+msgid "Send a message"
 msgstr ""
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, php-format
+msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#, php-format
+msgid "Direct messages to %s"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
+msgid "No message text!"
 msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
+#: 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/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
-msgid "Feed for tag %s"
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
+#: 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 ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
+#: 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 ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+msgid "Twitter settings"
 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/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+msgid "Current verified Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
 msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
 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/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
+msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+msgid "Twitter settings saved."
 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/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
+msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
+#: 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/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+msgid "Twitter preferences saved."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
+msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
+msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+msgid "Command results"
 msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
+#: classes/Command.php:96 classes/Command.php:113
+#, php-format
+msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
+msgid "User has no last notice"
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
+#: classes/Command.php:146 classes/Command.php:166
+msgid "Notice marked as fave."
 msgstr ""
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
-msgid "Notices tagged with %s"
+msgid "Homepage: %s"
 msgstr ""
 
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
 msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
+#: classes/Command.php:295 classes/Command.php:335
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: 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:28 actions/register.php:28
-msgid "Registration not allowed."
+#: classes/Command.php:313 classes/Command.php:356
+msgid "Notification off."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
+#: classes/Message.php:53 classes/Message.php:56
+msgid "Could not insert message."
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
+#: classes/Message.php:63 classes/Message.php:66
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
 msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: lib/mail.php:253 lib/mail.php:512
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: lib/mailbox.php:43 lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: lib/openid.php:195 lib/openid.php:203
+msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+msgid "Favorites"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
 msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
 msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
+msgid "Twitter"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
+msgid "Twitter integration options"
 msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+msgid "Could not parse message."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
+#: 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."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "По�тавки"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "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 ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
 msgstr ""
 
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
+#: 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"
 msgstr ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "�ема таков кори�ник."
+
+#: actions/block.php:129
+msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/block.php:162
+#, fuzzy
+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 ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
 #, php-format
-msgid "Updates from %1$s on %2$s!"
+msgid "Edit %s group"
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: 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/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: 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"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
+#: 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/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Кори�никот не може да �е о�вежи/"
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "По�тавките �е �нимени."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Грешка �о кодот за потврдување."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
 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/emailsettings.php:157
+msgid "Send me email when someone "
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: 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 ""
+"И�пративме код за потврда на IM адре�ата што ја додадовте. Мора да го "
+"одобрите %S за да ви и�праќа пораки."
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/facebookhome.php:110
+msgid "Server error - couldn't get user!"
+msgstr ""
+
+#: actions/facebookhome.php:196
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "If you would like the %s app to automatically update "
 msgstr ""
 
-#: ../lib/mail.php:147
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, 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 "Allow %s to update my Facebook status"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: actions/facebookhome.php:218
+msgid "Skip"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
+#: actions/facebookhome.php:235
+#, 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
+#, fuzzy
+msgid "After"
+msgstr "« Следни"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#, fuzzy
+msgid "Before"
+msgstr "Предходни »"
+
+#: actions/facebookinvite.php:70
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
+#: 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:"
 msgstr ""
 
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
 msgstr ""
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
+#: 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!"
 msgstr ""
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Преференциите �е �нимени."
+
+#: actions/facebooksettings.php:90
+msgid "Automatically update my Facebook status with my notices."
 msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Favor"
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Профил"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
 msgstr ""
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Преференции"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
+#: 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."
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/featured.php:71
 #, php-format
-msgid "%s favorite notices"
+msgid "Featured users, page %d"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/featured.php:99
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/inbox.php:28
-#, php-format
-msgid "Inbox for %s - page %d"
+#: actions/finishremotesubscribe.php:188
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/inbox.php:30
-#, php-format
-msgid "Inbox for %s"
+#: actions/groupbyid.php:79
+msgid "No ID"
 msgstr ""
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+msgid "Group logo"
 msgstr ""
 
-#: actions/invite.php:178
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "�ватарот е ажуриран."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Товарањето на аватарот не у�пеа."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: actions/login.php:126
-msgid "Login with your username and password. "
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
 msgstr ""
 
-#: actions/newmessage.php:65
-msgid "No recipient specified."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
+#: actions/groups.php:90
+#, php-format
+msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: 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 ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
+"Барајте луѓе на %%site.name%% �поред нивното име, локација или интере�и. "
+"Термините одделете ги �о празни ме�та. �ајмала должина е 3 знаци."
 
-#: actions/newmessage.php:108
-msgid "No such user"
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "Пребарување на луѓе"
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
 msgstr ""
 
-#: actions/newmessage.php:117
-msgid "New message"
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
 msgstr ""
 
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
+#: actions/imsettings.php:147
+#, fuzzy
+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/openidsettings.php:28
+#: actions/joingroup.php:95
+#, 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"
+
+#: actions/joingroup.php:135
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgid "%s joined group %s"
 msgstr ""
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/leavegroup.php:65
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "�ема такво изве�тување."
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "�е ни го и�пративте тој профил."
+
+#: actions/leavegroup.php:100
+msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/outbox.php:28
-#, php-format
-msgid "Outbox for %s - page %d"
+#: actions/leavegroup.php:130
+msgid "Could not find membership record."
 msgstr ""
 
-#: actions/outbox.php:30
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "OpenID формуларот не може да �е креира:%s"
+
+#: actions/leavegroup.php:145
 #, php-format
-msgid "Outbox for %s"
+msgid "%s left group %s"
 msgstr ""
 
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
 msgstr ""
 
-#: actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
+#: actions/newgroup.php:177
+#, fuzzy
+msgid "Could not create group."
+msgstr "Информациите за аватарот не може да �е �нимат"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "�е може да �е креира претплатата"
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "Датотеката е преголема."
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "Изве�тувања"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
 msgstr ""
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
+#: actions/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "Пријавување �о OpenID"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "От�трани го OpenID-то"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "По�тавки"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
 msgstr ""
 
-#: actions/register.php:216
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "Барај"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Локацијата е предолга (мак�имумот е 255 знаци)."
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Промени ја лозинката"
+
+#: actions/passwordsettings.php:89
+#, 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 ""
+
+#: actions/peopletag.php:91
 #, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "�епознат профил"
+
+#: actions/profilesettings.php:124
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/profilesettings.php:144
+msgid "Automatically subscribe to whoever "
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: 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."
+msgstr ""
+
+#: actions/public.php:220
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
 
-#: actions/showfavorites.php:61
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Јавен канал"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Feed for favorites of %s"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/showmessage.php:33
-msgid "No such message."
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: 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 ""
 
-#: actions/showmessage.php:61
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: 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 на Вашата домашна �траница, блог или профил на друго ме�то."
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Опишете �е �ебе �и и �оп�твените интере�и во 140 знаци."
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "Каде �е наоѓате, на пр. „Град, Држава“."
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
 msgstr ""
+"о�вен �ледниве лични податоци: лозинка, адре�а за е-пошта, адре�а за ИМ, "
+"телефон�ки број."
 
-#: actions/showmessage.php:66
+#: actions/register.php:471
 #, php-format
-msgid "Message from %1$s on %2$s"
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/register.php:495
+msgid "(You should receive a message by email "
 msgstr ""
 
-#: actions/smssettings.php:312
+#: 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"
+
+#: actions/showfavorites.php:79
 #, php-format
-msgid "Mobile carrier for your phone. "
+msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
-msgid "Direct messages to %s"
+msgid "%s group"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/showgroup.php:79
 #, php-format
-msgid "All the direct messages sent to %s"
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
+#: 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"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: 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"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, 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 ""
+
+#: actions/showgroup.php:370
+msgid "All members"
+msgstr ""
+
+#: actions/showgroup.php:378
 #, php-format
-msgid "All the direct messages sent from %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: 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"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Претплатници"
+
+#: actions/showstream.php:533
+msgid "All groups"
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/showstream.php:542
 #, php-format
-msgid "%s / Favorites from %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+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"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: 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 "Претплатници"
+
+#: actions/subscribers.php:52
 #, php-format
-msgid "%s updates favorited by %s / %s."
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: 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
+#, 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."
+
+#: actions/subscriptions.php:122
+#, fuzzy
+msgid "Jabber"
+msgstr "�ема JabberID."
+
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Микроблог на %s"
+
+#: actions/tag.php:66
 #, php-format
-msgid "%s added your notice as a favorite"
+msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: 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 "Tag %s"
+msgstr ""
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr ""
+
+#: actions/tagother.php:149
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/tagother.php:164
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/tagother.php:191
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
+#: 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."
 msgstr ""
 
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
+#: 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."
 msgstr ""
 
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "�е е пронаједено барање."
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "�ова лозинка"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
 msgstr ""
 
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
 msgstr ""
 
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
+#: actions/twittersettings.php:341
+#, fuzzy, php-format
+msgid "Unable to retrieve account information "
+msgstr "�е може да �е креира потврда за е-пошта."
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Грешка во �нимањето на кори�никот."
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Серверот не до�тави URL за профилот."
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Оддалечениот профил нема одговарачки профил"
+
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Откажи ја претплатата"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
 msgstr ""
 
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Проблем во �нимањето на изве�тувањето."
+
+#: classes/Notice.php:109
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+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 "Unable to retrieve account information for \"%s\" from Twitter."
+msgid "%s - %s"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
+#: lib/action.php:145
+msgid "Untitled page"
 msgstr ""
 
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
+#: lib/action.php:316
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
+#: lib/action.php:325
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "За"
+
+#: lib/action.php:328
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
+#: lib/action.php:332
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
+#: lib/action.php:335
+msgid "Login to the site"
 msgstr ""
 
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Креирај нова �метка"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "�ема таков OpenID."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Помош"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "�ово изве�тување"
+
+#: lib/action.php:417
+msgid "Local views"
 msgstr ""
 
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "�ово изве�тување"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Претплати"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
 msgstr ""
 
-#: classes/Channel.php:113
-msgid "Command results"
+#: lib/action.php:630
+msgid "All "
 msgstr ""
 
-#: classes/Channel.php:148
-msgid "Command complete"
+#: lib/action.php:635
+msgid "license."
 msgstr ""
 
-#: classes/Channel.php:158
-msgid "Command failed"
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "�ема таков кори�ник."
+
+#: lib/blockform.php:153
+msgid "Block"
 msgstr ""
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
 msgstr ""
 
-#: classes/Command.php:96
+#: lib/facebookaction.php:268
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
+#: 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/feedlist.php:64
+msgid "Export data"
 msgstr ""
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
+#: lib/galleryaction.php:121
+msgid "Filter tags"
 msgstr ""
 
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
+#: lib/galleryaction.php:131
+msgid "All"
 msgstr ""
 
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
+#: lib/galleryaction.php:137
+msgid "Tag"
 msgstr ""
 
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
+#: lib/galleryaction.php:139
+msgid "Go"
 msgstr ""
 
-#: classes/Command.php:178
-#, php-format
-msgid "About: %s"
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "URL на Вашата домашна �траница, блог или профил на друго ме�то."
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Претплати"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Опишете �е �ебе �и и �оп�твените интере�и во 140 знаци."
+
+#: lib/groupeditform.php:158
+#, 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"
 msgstr ""
 
-#: classes/Command.php:200
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Edit %s group properties"
 msgstr ""
 
-#: classes/Command.php:214
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Одјави �е"
+
+#: lib/groupnav.php:107
 #, php-format
-msgid "Direct message to %s sent"
+msgid "Add or edit %s logo"
 msgstr ""
 
-#: classes/Command.php:216
-msgid "Error sending direct message."
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
 msgstr ""
 
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
 msgstr ""
 
-#: classes/Command.php:270
+#: lib/grouptagcloudsection.php:56
 #, php-format
-msgid "Subscribed to %s"
+msgid "Tags in %s group's notices"
 msgstr ""
 
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Оваа �траница не е до�тапна во форматот кој Вие го прифаќате."
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Пријави �е"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Сними"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Погрешно име или лозинка."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Креирај нова �метка"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
 msgstr ""
 
-#: classes/Command.php:295
+#: lib/mail.php:175
 #, php-format
-msgid "Unsubscribed from %s"
+msgid ""
+"Hey, %s.\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s �ега ги �леди вашите забелешки за %2$s."
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Локација"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Домашна �траница"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:313
-msgid "Notification off."
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
 msgstr ""
 
-#: classes/Command.php:315
-msgid "Can't turn off notification."
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr ""
 
-#: classes/Command.php:333
-msgid "Notification on."
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s �ега ги �леди вашите забелешки за %2$s."
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
 msgstr ""
 
-#: classes/Command.php:335
-msgid "Can't turn on notification."
+#: lib/messageform.php:110
+msgid "Send a direct notice"
 msgstr ""
 
-#: classes/Command.php:344
-msgid "Commands:\n"
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "�ово изве�тување"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 или повеќе знаци"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "во одговор на..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
 msgstr ""
 
-#: classes/Message.php:53
-msgid "Could not insert message."
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "одговор"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+msgid "Delete this notice"
 msgstr ""
 
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
+#: lib/noticelist.php:474
+msgid "Delete"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
 msgstr ""
 
-#: lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: lib/nudgeform.php:128
+msgid "Nudge"
 msgstr ""
 
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/personaltagcloudsection.php:56
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
+#: lib/profilelist.php:182
+msgid "(none)"
 msgstr ""
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
-msgstr ""
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Јавен"
 
-#: lib/personal.php:65
-msgid "Favorites"
+#: lib/publicgroupnav.php:80
+msgid "User groups"
 msgstr ""
 
-#: lib/personal.php:66
-#, php-format
-msgid "%s's favorite notices"
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
 msgstr ""
 
-#: lib/personal.php:66
-msgid "User"
+#: lib/publicgroupnav.php:86
+msgid "Featured"
 msgstr ""
 
-#: lib/personal.php:75
-msgid "Inbox"
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "Пребарување на луѓе"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Изве�тувања"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
 msgstr ""
 
-#: lib/personal.php:76
-msgid "Your incoming messages"
+#: lib/section.php:89
+msgid "Untitled section"
 msgstr ""
 
-#: lib/personal.php:80
-msgid "Outbox"
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Оддалечена претплата"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Оддалечена претплата"
+
+#: lib/subgroupnav.php:97
+#, php-format
+msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/personal.php:81
-msgid "Your sent messages"
+#: lib/subgroupnav.php:104
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/settingsaction.php:99
-msgid "Twitter"
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Кори�никот нема профил."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Претплатата е одобрена"
+
+#: lib/tagcloudsection.php:56
+msgid "None"
 msgstr ""
 
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
+#: lib/topposterssection.php:74
+msgid "Top posters"
 msgstr ""
 
-#: lib/util.php:1718
-msgid "To"
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "�ема таков кори�ник."
+
+#: lib/unblockform.php:150
+msgid "Unblock"
 msgstr ""
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "Креирај нова �метка"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "�дре�ата за е-пошта неможе да �е потврди."
+
+#~ msgid "Email address"
+#~ msgstr "�дре�а за е-пошта"
+
+#~ msgid "Error inserting notice"
+#~ 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 ""
+#~ "�ко �те ја заборавиле или загубиле лозинката, можете да добиете нова на "
+#~ "адре�ата што ја вне�овте во Вашата �метка."
diff --git a/locale/nb_NO/LC_MESSAGES/laconica.mo b/locale/nb_NO/LC_MESSAGES/laconica.mo
new file mode 100644
index 000000000..84e90242e
--- /dev/null
+++ b/locale/nb_NO/LC_MESSAGES/laconica.mo
diff --git a/locale/nb_NO/LC_MESSAGES/laconica.po b/locale/nb_NO/LC_MESSAGES/laconica.po
new file mode 100644
index 000000000..38d4248b7
--- /dev/null
+++ b/locale/nb_NO/LC_MESSAGES/laconica.po
@@ -0,0 +1,4740 @@
+# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.po  #-#-#-#-#\n"
+"X-Poedit-Language: Norwegian Bokmal\n"
+"X-Poedit-Country: NORWAY\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
+#, 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 ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:347
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr ""
+
+#: ../lib/mail.php:126
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s.\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: 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 ""
+
+#: ../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 ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
+#, php-format
+msgid "%s Public Stream"
+msgstr ""
+
+#: ../actions/all.php:47 ../actions/allrss.php:60
+#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
+#: actions/allrss.php: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 og venner"
+
+#: ../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
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#, 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
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
+msgid "6 or more characters"
+msgstr "6 eller flere tegn"
+
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
+#: actions/recoverpassword.php:220
+msgid "6 or more characters, and don't forget it!"
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55 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 ""
+
+#: ../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 ""
+
+#: ../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 "Aksepter"
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:422
+msgid "All subscriptions"
+msgstr "Alle abonnementer"
+
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
+#, php-format
+msgid "All updates for %s"
+msgstr "Alle oppdateringer for %s"
+
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
+#, 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
+msgid "Already logged in."
+msgstr "Allerede logget inn."
+
+#: ../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 "Autoriser abonnementet"
+
+#: ../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 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 "
+
+#: ../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 "Avataren har blitt oppdatert."
+
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+
+#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+#: actions/smssettings.php:111
+msgid "Awaiting confirmation on this phone number."
+msgstr "Venter på bekreftelse på dette telefonnummeret"
+
+#: ../lib/util.php:1318 lib/util.php:1452
+#, fuzzy
+msgid "Before »"
+msgstr "Tidligere »"
+
+#: ../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/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 "Bioen er for lang (max 140 tegn)"
+
+#: ../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 ""
+
+#: ../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 det nye passordet"
+
+#: ../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"
+
+#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+msgid "Cannot instantiate OpenID consumer object."
+msgstr ""
+
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
+msgid "Cannot normalize that Jabber ID"
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
+msgid "Change"
+msgstr "Endre"
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Endre passord"
+
+#: ../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 "Bekreft"
+
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Bekreft 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 "Bekreftelse avbrutt."
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr "Bekreftelseskode"
+
+#: ../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."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
+msgid "Connect"
+msgstr "Koble til"
+
+#: ../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 "Kontakt"
+
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#, php-format
+msgid "Could not create OpenID form: %s"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#, 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."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166
+msgid "Could not save avatar info"
+msgstr "Klarte ikke å lagre avatar-informasjonen"
+
+#: ../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."
+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/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/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."
+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 "Klarte ikke å lagre profil."
+
+#: ../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 "Klarte ikke å oppdatere bruker."
+
+#: ../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 "Lag en ny bruker med dette nicket."
+
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
+msgid "Create new account"
+msgstr "Opprett en ny konto"
+
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:231
+msgid "Creating new account for OpenID that already has a user."
+msgstr ""
+
+#: ../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/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 ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr ""
+
+#: ../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 "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/emailsettings.php:32 actions/emailsettings.php:32
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Innstillinger for e-post"
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 "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."
+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/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/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, php-format
+msgid "Feed for tag %s"
+msgstr "Feed for taggen %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 "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."
+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 "IM-adresse"
+
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Innstillinger for 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 ""
+
+#: ../actions/openidsettings.php:45
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+
+#: ../actions/recoverpassword.php:137
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored  in your account."
+msgstr ""
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+#: actions/emailsettings.php:127 actions/smssettings.php:140
+msgid "Incoming email"
+msgstr "innkommende e-post"
+
+#: ../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 "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/recoverpassword.php:265
+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/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
+#, php-format
+msgid "Invalid avatar URL '%s'"
+msgstr "Ugyldig avatar-URL '%s'"
+
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
+#, php-format
+msgid "Invalid homepage '%s'"
+msgstr "Ugyldig hjemmeside '%s'"
+
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
+#, php-format
+msgid "Invalid license URL '%s'"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
+msgid "Invalid notice url"
+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/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."
+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/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 [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: actions/imsettings.php:296
+msgid "Jabber ID already belongs to another user."
+msgstr ""
+
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
+#, php-format
+msgid ""
+"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
+"add %s to your buddy list in your IM client or on GTalk."
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: 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)."
+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 ""
+
+#: ../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/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/login.php:126
+#, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
+msgstr ""
+
+#: ../lib/util.php:308 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: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/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#, php-format
+msgid "Microblog by %s"
+msgstr "Mikroblogg av %s"
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php: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 "Ny"
+
+#: ../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: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 "Nytt nick"
+
+#: ../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 "Nytt passord"
+
+#: ../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 "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/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 "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"
+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"
+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!"
+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 "Ingen e-postadresse."
+
+#: ../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 ""
+
+#: ../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/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
+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 ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+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
+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 "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)."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+#: actions/remotesubscribe.php:152
+msgid "Not a valid profile URL (no XRDS defined)."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:143
+msgid "Not a valid profile URL (no YADIS document)."
+msgstr ""
+
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
+msgid "Not an image or corrupt file."
+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!"
+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 "Ikke logget inn."
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73
+msgid "OpenID Account Setup"
+msgstr ""
+
+#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+msgid "OpenID Auto-Submit"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+msgid "OpenID Login"
+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"
+
+# -#-#-#-
+#  laconica.po#-#-#-#-
+#  eller autentifikasjon?
+#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
+#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#, fuzzy
+msgid "OpenID authentication cancelled."
+msgstr ""
+"#-#-#-#-#  laconica.po  #-#-#-#-#\n"
+"OpenID-autentifisering avbrutt.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../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 ""
+
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
+#: actions/openidsettings.php:231
+msgid "OpenID removed."
+msgstr "OpenID fjernet"
+
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
+#: actions/openidsettings.php:59
+msgid "OpenID settings"
+msgstr "Innstillinger for OpenID"
+
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+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 "Passord"
+
+#: ../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 "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"
+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."
+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"
+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 "Personlig"
+
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/userauthorization.php:78
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user's notices. If you didn't just ask to subscribe to someone's notices, "
+"click \"Cancel\"."
+msgstr ""
+
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
+#: actions/imsettings.php:142
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr ""
+
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 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"
+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 "Profil"
+
+#: ../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/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
+msgid "Public timeline"
+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"
+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/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+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 "Husk meg"
+
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
+msgid "Remote profile with no matching profile"
+msgstr ""
+
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
+msgid "Remote subscribe"
+msgstr ""
+
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 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
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+
+#: ../lib/stream.php:55 lib/personal.php:55 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
+#, 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"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+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"
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../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 "Lagre"
+
+#: ../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/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
+msgid "Search Stream Feed"
+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 ""
+
+#: ../actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: 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 "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."
+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 ""
+
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: ../lib/util.php:304 lib/util.php:320 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 ""
+
+#: ../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 "Kilde"
+
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
+msgid "Statistics"
+msgstr "Statistikk"
+
+#: ../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 ""
+
+#: ../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 "Tagger"
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr "Tekst"
+
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:67
+msgid "Text search"
+msgstr "Tekst-søk"
+
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
+#: actions/openidsettings.php:227
+msgid "That OpenID does not belong to you."
+msgstr ""
+
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+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:191 actions/emailsettings.php:209
+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 "Den filen er for stor."
+
+#: ../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/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/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/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/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/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/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/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 ""
+
+#: ../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/confirmaddress.php:92 actions/confirmaddress.php:92
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr ""
+
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: 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:"
+msgstr ""
+
+#: ../actions/userauthorization.php:322
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site's instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr ""
+
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
+msgid "These are the people who listen to your notices."
+msgstr ""
+
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr ""
+
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+msgid "These are the people whose notices you listen to."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr ""
+
+#: ../actions/recoverpassword.php:88
+msgid "This confirmation code is too old. Please start again."
+msgstr ""
+
+#: ../lib/openid.php:195
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
+#: 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 ""
+
+#: ../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"
+msgstr "Tidssone"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:43
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: 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 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"
+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/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 ""
+
+#: ../lib/util.php:269 lib/util.php:285
+msgid ""
+"Unless otherwise specified, contents of this site are copyright by the "
+"contributors and available under the "
+msgstr ""
+
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
+msgid "Unsupported image file format."
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "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."
+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 ""
+
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
+msgid "User nickname"
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#, php-format
+msgid "What's up, %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\""
+msgstr ""
+
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
+#, php-format
+msgid "Wrong image type for '%s'"
+msgstr ""
+
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
+#, 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
+msgid "Yes"
+msgstr "Ja"
+
+#: ../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!"
+msgstr "Du er allerede logget inn!"
+
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/password.php:27
+msgid "You can change your password here. Choose a good one!"
+msgstr ""
+
+#: ../actions/register.php:135 actions/register.php:145
+msgid "You can create a new account to start posting notices."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../actions/openidsettings.php:86
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+
+#: ../actions/profilesettings.php:27
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: 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
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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 ""
+
+#: ../actions/recoverpassword.php:164
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+
+#: ../actions/openidsettings.php:28
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
+"account.  Manage your associated OpenIDs from here."
+msgstr ""
+
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+msgid "a few seconds ago"
+msgstr "noen få sekunder siden"
+
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#, php-format
+msgid "about %d days ago"
+msgstr "omtrent %d dager siden"
+
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#, php-format
+msgid "about %d hours ago"
+msgstr "omtrent %d timer siden"
+
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#, php-format
+msgid "about %d minutes ago"
+msgstr "omtrent %d minutter siden"
+
+#: ../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"
+
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+msgid "about a day ago"
+msgstr "omtrent én dag siden"
+
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+msgid "about a minute ago"
+msgstr "omtrent ett minutt siden"
+
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+msgid "about a month ago"
+msgstr "omtrent én måned siden"
+
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+msgid "about a year ago"
+msgstr "omtrent ett år siden"
+
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+msgid "about an hour ago"
+msgstr "omtrent én time siden"
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
+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/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 ""
+
+#: 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
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53 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 ""
+
+#: 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 ""
+
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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
+#, php-format
+msgid "Feed for favorites of %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 ""
+
+#: 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/showmessage.php:61 actions/showmessage.php:108
+#, 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"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, 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"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#, 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"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, 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."
+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/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#, php-format
+msgid "%s updates favorited by %s / %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 ""
+
+#: 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 ""
+
+#: 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/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 ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: 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 ""
+
+#: 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/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 ""
+
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96 classes/Command.php:113
+#, 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."
+msgstr ""
+
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175 classes/Command.php:198
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270 classes/Command.php:307
+#, 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"
+msgstr ""
+
+#: classes/Command.php:295 classes/Command.php:335
+#, 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."
+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 ""
+
+#: 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 ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253 lib/mail.php:512
+#, 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."
+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
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: 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 ""
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s og venner"
+
+#: actions/avatarsettings.php:76
+msgid "You can upload your personal avatar."
+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"
+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
+#, 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"
+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
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Du er allerede logget inn!"
+
+#: actions/block.php:167
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been "
+msgstr ""
+
+#: actions/deletenotice.php:73
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
+#, 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"
+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
+#, fuzzy
+msgid "No nickname"
+msgstr "Nytt nick"
+
+#: 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/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 ""
+
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+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 "Bioen er for lang (max 140 tegn)"
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Klarte ikke å oppdatere bruker."
+
+#: actions/editgroup.php:226
+msgid "Options saved."
+msgstr ""
+
+#: 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/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
+msgstr ""
+
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
+msgstr ""
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+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. "
+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 ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, php-format
+msgid "Allow %s to update my Facebook status"
+msgstr ""
+
+#: actions/facebookhome.php:218
+msgid "Skip"
+msgstr ""
+
+#: actions/facebookhome.php:235
+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
+#, fuzzy
+msgid "Before"
+msgstr "Tidligere »"
+
+#: actions/facebookinvite.php:70
+#, 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:"
+msgstr ""
+
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
+msgstr ""
+
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "Feed for %s sine venner"
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
+msgstr ""
+
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Klarte ikke å oppdatere bruker."
+
+#: 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."
+msgstr ""
+
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Profil"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, 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
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.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
+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/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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Avataren har blitt oppdatert."
+
+#: actions/grouplogo.php:450
+msgid "Failed updating logo."
+msgstr ""
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+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
+#, 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 "
+msgstr ""
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+msgid "Send me replies through Jabber/GTalk "
+msgstr ""
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Bekreftelseskode"
+
+#: actions/joingroup.php:65
+msgid "You must be logged in to join a group."
+msgstr ""
+
+#: actions/joingroup.php:95
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Du er allerede logget inn!"
+
+#: actions/joingroup.php:128
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr ""
+
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "No such group."
+msgstr "Klarte ikke å lagre profil."
+
+#: 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 ""
+
+#: 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
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: 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
+#, 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; "
+msgstr ""
+
+#: actions/newnotice.php:166
+msgid "Notice posted"
+msgstr ""
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
+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/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "OpenID"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Fjern OpenID"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Innstillinger for IM"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "Søk"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+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
+#, fuzzy
+msgid "Password change"
+msgstr "Passordet ble lagret"
+
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Ugyldig e-postadresse"
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:91
+#, 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"
+msgstr ""
+
+#: actions/profilesettings.php:144
+#, fuzzy
+msgid "Automatically subscribe to whoever "
+msgstr "Abonner "
+
+#: actions/profilesettings.php:229 actions/tagother.php:176
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ugyldig hjemmeside '%s'"
+
+#: actions/profilesettings.php:311
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Klarte ikke å lagre profil."
+
+#: actions/public.php:107
+#, php-format
+msgid "Public timeline, page %d"
+msgstr ""
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/public.php:220
+#, 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"
+msgstr ""
+
+#: actions/publictagcloud.php:63
+#, 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 ""
+
+#: actions/register.php:382 actions/register.php:386
+msgid "Used only for updates, announcements, "
+msgstr ""
+
+#: actions/register.php:398
+#, fuzzy
+msgid "URL of your homepage, blog, "
+msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Beskriv degselv og dine interesser med 140 tegn"
+
+#: 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 ""
+
+#: 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
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Svar til %s"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
+msgstr ""
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
+
+#: actions/showgroup.php:206
+#, fuzzy
+msgid "Group profile"
+msgstr "Klarte ikke å lagre profil."
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
+msgstr ""
+
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+msgid "Note"
+msgstr ""
+
+#: actions/showgroup.php:270
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, php-format
+msgid "Notice feed for %s group"
+msgstr ""
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
+msgid "Members"
+msgstr "Medlem siden"
+
+#: 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/showgroup.php:370
+msgid "All members"
+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 "
+msgstr ""
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
+msgstr ""
+
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
+msgstr ""
+
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Profil"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "Klarte ikke å lagre profil."
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Alle abonnementer"
+
+#: actions/showstream.php:533
+msgid "All groups"
+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 "
+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
+#, 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"
+msgstr ""
+
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+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"
+
+#: actions/subscribe.php:69
+msgid "Subscribed"
+msgstr ""
+
+#: actions/subscribers.php:50
+#, php-format
+msgid "%s subscribers"
+msgstr ""
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr ""
+
+#: actions/subscribers.php:63
+msgid "These are the people who listen to "
+msgstr ""
+
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who "
+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 "
+msgstr ""
+
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose "
+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
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+msgstr ""
+
+#: actions/tagother.php:33
+#, fuzzy
+msgid "Not logged in"
+msgstr "Ikke logget inn."
+
+#: actions/tagother.php:39
+msgid "No id argument."
+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"
+msgstr ""
+
+#: actions/tagother.php:164
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+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."
+msgstr ""
+
+#: actions/tagrss.php:35
+msgid "No such tag."
+msgstr ""
+
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Mikroblogg av %s"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "Ingen id."
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Nytt passord"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
+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 ""
+
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:71
+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 ""
+
+#: classes/Notice.php:104
+msgid "Problem saving notice. Unknown user."
+msgstr ""
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: 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"
+msgstr ""
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "Om"
+
+#: lib/action.php:328
+msgid "Change your email, avatar, password, profile"
+msgstr ""
+
+#: 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"
+msgstr ""
+
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Opprett en ny konto"
+
+#: lib/action.php:341
+msgid "Login with OpenID"
+msgstr ""
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Hjelp"
+
+#: lib/action.php:362
+msgid "Site notice"
+msgstr ""
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+msgid "Page notice"
+msgstr ""
+
+#: lib/action.php:562
+msgid "Secondary site navigation"
+msgstr ""
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+msgid "All "
+msgstr ""
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+msgid "Block this user"
+msgstr ""
+
+#: lib/blockform.php:153
+msgid "Block"
+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/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+#, fuzzy
+msgid "Filter tags"
+msgstr "Feed for taggen %s"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
+
+#: lib/galleryaction.php:137
+#, fuzzy
+msgid "Tag"
+msgstr "Tagger"
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Alle abonnementer"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Beskriv degselv og dine interesser med 140 tegn"
+
+#: lib/groupeditform.php:158
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Logg ut"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+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 "
+msgstr ""
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Logg inn"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Lagre"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Ugyldig brukernavn eller passord"
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Opprett en ny konto"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, php-format
+msgid "%1$s is now listening to "
+msgstr ""
+
+#: lib/mail.php:254
+#, php-format
+msgid "Location: %s\n"
+msgstr ""
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Hjemmesiden"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
+
+#: lib/mail.php:555
+#, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr ""
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
+msgstr ""
+
+#: lib/messageform.php:110
+msgid "Send a direct notice"
+msgstr ""
+
+#: lib/noticeform.php:125
+msgid "Send a notice"
+msgstr ""
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 eller flere tegn"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "svar"
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
+msgstr ""
+
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "svar"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+msgid "Delete this notice"
+msgstr ""
+
+#: lib/noticelist.php:474
+#, fuzzy
+msgid "Delete"
+msgstr "slett"
+
+#: 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/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr ""
+
+#: lib/publicgroupnav.php:76
+#, fuzzy
+msgid "Public"
+msgstr "Offentlig"
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#, fuzzy
+msgid "Recent tags"
+msgstr "Nyeste Tagger"
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90
+msgid "Popular"
+msgstr ""
+
+#: lib/searchgroupnav.php:82
+msgid "Notice"
+msgstr ""
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr ""
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, php-format
+msgid "People %s subscribes to"
+msgstr ""
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Svar til %s"
+
+#: lib/subgroupnav.php:97
+#, 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 ""
+
+#: lib/subs.php:53
+msgid "User has blocked you."
+msgstr ""
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr ""
+
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr ""
+
+#: lib/topposterssection.php:74
+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 "Opprett en ny konto"
+
+#~ msgid " by "
+#~ msgstr "av"
diff --git a/locale/nl_NL/LC_MESSAGES/laconica.mo b/locale/nl_NL/LC_MESSAGES/laconica.mo
index d53c052e4..564d6f709 100644
--- a/locale/nl_NL/LC_MESSAGES/laconica.mo
+++ b/locale/nl_NL/LC_MESSAGES/laconica.mo
diff --git a/locale/nl_NL/LC_MESSAGES/laconica.po b/locale/nl_NL/LC_MESSAGES/laconica.po
index 68870c232..48ee3dd9a 100644
--- a/locale/nl_NL/LC_MESSAGES/laconica.po
+++ b/locale/nl_NL/LC_MESSAGES/laconica.po
@@ -3,49 +3,87 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-01-22 15:48+0000\n"
+"Last-Translator: chris <chris@chrisvandesteeg.nl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Doorzoek de stroom naar \"%s\""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../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."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 " behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
 "telefoonnummer."
 
-#: ../actions/subscribe.php:84
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr " van "
+
+#: ../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 antwoordend op %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 heeft je uitgenodigd voor %2$s"
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s volgt nu je berichten op %2$s."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -62,129 +100,287 @@ msgstr ""
 "Met vriendelijke groet,\n"
 "%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../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 "%1$s's status op %2$s"
 
-#: ../actions/publicrss.php:60 ../actions/publicrss.php:62
-#: actions/publicrss.php:48
+#: ../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
-#, fuzzy
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
+#, fuzzy, php-format
 msgid "%s Public Stream"
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "%s openbare stroom\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#: ../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"
 
-#: ../lib/util.php:233
+#: ../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
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
 #, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
-"**%%site.name%%** is een microbloggingdienst van "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:235
+#: ../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%%** is een microbloggingdienst van [%%site.broughtby%%](%%site."
+"broughtbyurl%%). "
+
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** is een microbloggingdienst. "
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 ". Van de oorspronkelijke auteurs dient de volledige naam of gebruikersnaam "
 "te worden vermeld."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: 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/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
 msgstr "6 of meer tekens"
 
-#: ../actions/recoverpassword.php:165
+#: ../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/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
 "Een bevestigingscode is verstuurd naar het opgegeven IM-adres. Je moet ermee "
 "accoord gaan dat %s boodschappen aan jou stuurt."
 
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55 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 ""
+
+#: ../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 ""
+
 #  This would be appropriate for the footer menu link (actual context isn't clear!)
-#: ../lib/util.php:296
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
 msgstr "Over ons"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "Accepteer"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "Voeg OpenID toe"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92
 msgid "Address"
 msgstr "Adres"
 
-#: ../actions/showstream.php:254
+#: ../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 "Alle abonnementen"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
 #, php-format
 msgid "All updates for %s"
 msgstr "Alle updates voor %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, 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:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "Al geabonneerd!"
 
-#: ../actions/userauthorization.php:76
+#: ../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 "Sta abonnement toe"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Voortaan automatisch inloggen; niet voor gemeenschappelijke computers!"
 
-#: ../actions/avatar.php:32
+#: ../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 "Avatar"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "Avatar geactualiseerd."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -194,246 +390,446 @@ msgstr ""
 "een boodschap met nadere instructies. (Heb je %s aan je contactenlijst "
 "toegevoegd?)"
 
-#: ../lib/util.php:1136
+#: ../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
+#, fuzzy
 msgid "Before »"
 msgstr "Eerder »"
 
-#: ../actions/profilesettings.php:52
+#: ../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/profilesettings.php:93 ../actions/updateprofile.php:102
+#: ../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/updateprofile.php:118
+#: ../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 "Kan avatar-URL '%s' niet lezen"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+#: ../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."
 
-#: ../actions/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: ../lib/openid.php:121
+#: ../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/imsettings.php:154
+#: ../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/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "Wijzig"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../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 "Bevestig"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Bevestig adres"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "Bevestiging geannuleerd."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Bevestigingscode niet gevonden."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "Koppel"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "Koppel bestaand account"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Contact"
 
-#: ../lib/openid.php:178 lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr ""
 
-#: ../lib/openid.php:160
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow 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 "Kon niet omleiden naar server: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166
 msgid "Could not save avatar info"
 msgstr "Kon avatarinformatie niet opslaan"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159
 msgid "Could not save new profile info"
 msgstr "Kon de nieuwe profielinformatie niet opslaan"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Kon e-mail niet bevestigen."
+#: ../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:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Kon abonnement niet aanmaken."
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: 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/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
 msgstr "Kon abonnement niet verwijderen."
 
-#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
+#: ../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."
 msgstr ""
 
-#: ../actions/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: actions/emailsettings.php:337 actions/imsettings.php:311
+#: actions/smssettings.php:325
 msgid "Couldn't insert confirmation code."
 msgstr "Kon bevestigingscode niet toevoegen"
 
 #: ../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/profilesettings.php:175
+#: ../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/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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 "Kon gebruiker niet actualiseren."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Aanmaken"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "Maak een nieuw account aan"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:231
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 "Bezig nieuw account aan te maken voor OpenID waarvoor al een "
 "gebruikersaccount bestaat."
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Huidig bevestigd Jabber/GTalk adres."
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../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 "Op dit moment"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Database-fout bij toevoegen antwoord: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../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 "Beschrijf jezelf en je interesses in 140 tekens"
 
-#: ../actions/register.php:181
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "E-mail"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "E-mailadres"
+#: ../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/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
 msgid "Email address already exists."
 msgstr "E-mailadres bestaat al."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
 msgstr "Bevestiging e-mailadres"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../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 "Voer een gebruikersnaam of e-mailadres in"
 
-#: ../actions/userauthorization.php:136
+#: ../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 "Fout bij autoriseren token"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../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/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+#: actions/finishaddopenid.php:126
 msgid "Error connecting user."
 msgstr "Fout bij koppelen gebruiker."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
 msgid "Error inserting avatar"
 msgstr "Fout bij toevoegen avatar"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
 msgid "Error inserting new profile"
 msgstr "Fout bij toevoegen nieuw profiel"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Fout bij toevoegen bericht"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
 msgid "Error inserting remote profile"
 msgstr "Fout bij toevoegen profiel op afstand"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
 msgstr "Fout bij opslaan adresbevestiging."
 
-#: ../actions/userauthorization.php:139
+#: ../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/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving the profile."
 msgstr "Fout bij opslaan van het profiel."
 
-#: ../lib/openid.php:237
+#: ../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/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164
 msgid "Error saving user; invalid."
 msgstr "Fout bij opslaan gebruiker; ongeldig."
 
-#: ../actions/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
 #: ../actions/login.php:47 ../actions/login.php:73
 #: ../actions/recoverpassword.php:307 ../actions/register.php:98
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108
+#: actions/register.php:108 actions/login.php:112 actions/login.php:138
+#: actions/recoverpassword.php:354 actions/register.php:198
 #, fuzzy
 msgid "Error setting user."
 msgstr ""
@@ -441,41 +837,64 @@ msgstr ""
 "Fout bij vastleggen gebruiker.\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
 msgid "Error updating profile"
 msgstr "Fout bij actualiseren profiel"
 
 #: ../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/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+#: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
 msgstr "Fout bij bevestigingscode."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "Gebruikersnaam bestaat al"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "Veelgestelde vragen"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "Actualiseren avatar niet gelukt."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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/replies.php:61 ../actions/repliesrss.php:80
+#: ../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 voor antwoorden aan %s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, 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
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -483,39 +902,68 @@ msgstr ""
 "Om veiligheidsredenen vragen we je je gebruikersnaam en wachtwoord nogmaals "
 "in te voeren alvorens je instellingen te veranderen."
 
-#: ../actions/profilesettings.php:44
+#: ../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:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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)"
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "Help"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "Home"
 
-#: ../actions/profilesettings.php:49
+#: ../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:87
+#: ../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/imsettings.php:61
+#: ../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 "IM-adres"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "IM-instellingen"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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."
@@ -531,95 +979,142 @@ msgstr ""
 "Als je een OpenID aan je account wilt toevoegen, vul het dan in het veld "
 "hieronder in en klik op \"Voeg toe\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"Als je je wachtwoord vergeten of kwijt bent, kan een nieuw wachtwoord worden "
-"opgestuurd naar het e-mailadres dat je in je account hebt vastgelegd."
 
-#: ../actions/password.php:69
+#: ../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 "Incorrect oud wachtwoord"
 
-#: ../actions/login.php:63
+#: ../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/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Instructies om je wachtwoord te herstellen zijn verstuurd naar het "
-"e-mailadres dat voor je account is geregistreerd."
+"Instructies om je wachtwoord te herstellen zijn verstuurd naar het e-"
+"mailadres dat voor je account is geregistreerd."
 
-#: ../actions/updateprofile.php:113
+#: ../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/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ongeldige homepage '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Ongeldige licentie-URL '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
 msgid "Invalid notice content"
 msgstr "Ongeldige berichtinhoud"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72
 msgid "Invalid notice uri"
 msgstr "Ongeldige bericht-URI"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "Ongeldige bericht-URL"
 
-#: ../actions/updateprofile.php:86
+#: ../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/remotesubscribe.php:96
+#: ../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/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/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Ongeldige afmeting."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
-#: ../lib/util.php:237
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Het draait op de [Laconica](http://laconi.ca/) microbloggingsoftware versie "
-"%s, beschikbaar onder the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Het draait op de [Laconica](http://laconi.ca/) microbloggingsoftware versie %"
+"s, beschikbaar onder the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../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/imsettings.php:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -628,341 +1123,626 @@ msgstr ""
 "Jabber of GTalk adres, zoals \"JouwNaam@example.org\". Zorg ervoor dat je "
 "eerst % aan je contactenlijst in je IM-programma of in GTalk toevoegt."
 
-#: ../actions/profilesettings.php:55
+#: ../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 ""
+
+#: ../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/profilesettings.php:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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/login.php:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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 "Inloggen"
 
-#: ../actions/openidlogin.php:44
+#: ../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/login.php:122
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
 "Log in met je gebruikersnaam en wachtwoord. Heb je nog geen gebruikersnaam? "
-"[Registreer](%%action.register%%) dan een nieuw account, of probeer "
-"[OpenID](%%action.openidlogin%%)."
+"[Registreer](%%action.register%%) dan een nieuw account, of probeer [OpenID]"
+"(%%action.openidlogin%%)."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Uitloggen"
 
-#: ../actions/login.php:106
+#: ../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 "Wachtwoord kwijt of vergeten?"
 
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
 #  String should contain a variable token for since 'when'
-#: ../actions/showstream.php:281
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:480
 msgid "Member since"
 msgstr "Lid sinds"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog van %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: 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/finishopenidlogin.php:71
+#: ../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 ""
+
+#: ../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 "Nieuwe gebruikersnaam"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "Nieuw bericht"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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/recoverpassword.php:275
+#: ../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:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../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/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59
+#: ../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:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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 ""
 "Gebruikersnaam moet bestaan uit alleen kleine letters en cijfers en geen "
 "spaties."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
 msgstr "Gebruikersnaam niet toegestaan."
 
-#: ../actions/remotesubscribe.php:72
+#: ../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/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "Gebruikersnaam of e-mail"
 
-#: ../actions/imsettings.php:147
+#: ../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 "Geen Jabber-ID."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "Geen autorisatieverzoek!"
 
-#: ../actions/confirmaddress.php:33
+#: ../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 "Geen bevestigingscode."
 
-#: ../actions/newnotice.php:49
+#: ../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/userbyid.php:27
+#: ../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 "Geen 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 "Geen gebruikersnaam verschaft door de server op afstand."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
 msgstr "Geen gebruikersnaam."
 
-#: ../actions/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: 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/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 "Geen profiel-URL teruggestuurd door de server."
 
-#: ../actions/recoverpassword.php:189
+#: ../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/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
 msgid "No request found!"
 msgstr "Geen verzoek gevonden!"
 
 #: ../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:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "Geen afmeting."
 
-#: ../actions/openidsettings.php:135
+#: ../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/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+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 "Die OpenID is niet bekend."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "Onbekend document."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+#: actions/recoverpassword.php:62
 msgid "No such recovery code."
 msgstr "Onbekende herstelcode."
 
-#: ../actions/postnotice.php:56
+#: ../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:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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."
 
-#: ../lib/gallery.php:76
+#: ../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 "Niemand te tonen!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+#: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr "Geen geldige herstelcode."
 
-#: ../actions/imsettings.php:158
+#: ../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 "Geen geldige Jabber-ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "Geen geldige OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../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 "Geen geldig e-mailadres."
 
-#: ../actions/profilesettings.php:83 ../actions/register.php:61
+#: ../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/remotesubscribe.php:118
+#: ../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/remotesubscribe.php:111
+#: ../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/remotesubscribe.php:104
+#: ../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/avatar.php:95
+#: ../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/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "Niet geautoriseerd."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "Onverwacht antwoord!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/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 "Niet ingelogd."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "Niet geabonneerd!"
 
-#: ../actions/showstream.php:82
+#: ../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 "Berichten-feed voor %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:94
 msgid "Notice has no profile"
 msgstr "Bericht heeft geen profiel"
 
-#: ../actions/showstream.php:297
+#: ../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/password.php:39
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "Oud wachtwoord"
 
-#: ../lib/util.php:288
+#: ../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: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:180 lib/openid.php:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: 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:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID-fout: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "OpenID-instellingen."
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "Onvolledige upload."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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/recoverpassword.php:249
+#: ../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/recoverpassword.php:245
+#: ../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/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../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/password.php:89 ../actions/recoverpassword.php:274
+#: ../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/password.php:61 ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../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"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Personen zoeken"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/userauthorization.php:78
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
@@ -973,91 +1753,156 @@ msgstr ""
 "aangegeven je op iemand's berichten te willen abonneren, klik dan op "
 "\"Annuleer\"."
 
-#: ../actions/imsettings.php:74
+#: ../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/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "Voorkeuren opgeslagen."
 
-#: ../lib/util.php:300
+#: ../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 "Privacy"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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."
 
-#: ../lib/stream.php:54
+#: ../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/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "Profiel-URL"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
 msgstr "Profielinstellingen"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Openbaar"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Openbare stream-feed"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "Openbare tijdlijn"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr "Herstellen"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198
 msgid "Recover password"
 msgstr "Wachtwoord herstellen"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
+#: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr "Herstelcode voor onbekende gebruiker."
 
-#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: 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/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "Afwijzen"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../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/updateprofile.php:69
+#: ../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/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "Abonneren op afstand"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: 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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "Verwijder OpenID"
 
@@ -1069,40 +1914,82 @@ 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:49
+#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
 msgid "Replies"
 msgstr "Antwoorden"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../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 "Antwoorden aan %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "Terugstellen"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "Wachtwoord terugstellen"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../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:76 ../actions/profilesettings.php:58
+#: ../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 "Opslaan"
 
-#: ../lib/searchaction.php:73 ../lib/util.php:277
+#: ../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/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "Doorzoek stroom-feed"
 
-#: ../actions/noticesearch.php:30
+#: ../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 "
@@ -1121,114 +2008,241 @@ msgstr ""
 "interesses. Scheid de zoektermen met spaties; ze moeten uit 3 of meer tekens "
 "bestaan."
 
-#: ../lib/util.php:982
+#: ../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 "Verstuur"
 
-#: ../actions/imsettings.php:71
+#: ../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 "Stuur mij berichten via Jabber/GTalk."
 
-#: ../lib/util.php:282
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "Instellingen opgeslagen."
 
-#: ../actions/finishaddopenid.php:66
+#: ../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 "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."
 
-#: ../lib/util.php:302 ../lib/util.php:330 lib/util.php:346
+#: ../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:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../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/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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/showstream.php:294 ../actions/subscribers.php:27
+#: ../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/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "Abonnement geautoriseerd"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "Abonnement afgewezen"
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../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/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
 msgid "System error uploading file."
 msgstr "Systeemfout bij uploaden bestand."
 
-#: ../actions/noticesearch.php:34
+#: ../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 "Tekst doorzoeken"
 
-#: ../actions/openidsettings.php:140
+#: ../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/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "Dat adres is al bevestigd."
 
-#: ../actions/confirmaddress.php:43
+#: ../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/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "Dat bestand is te groot."
 
-#: ../actions/imsettings.php:161
+#: ../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/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../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/imsettings.php:201
+#: ../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 "Dat is het verkeerde IM-adres."
 
-#: ../actions/newnotice.php:52
+#: ../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 "Dat is te lang. Maximale berichtlengte is 140 tekens."
 
-#: ../actions/confirmaddress.php:86
+#: ../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/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Het adres \"%s\" is voor je account bevestigd."
 
-#: ../actions/imsettings.php:241
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413
 msgid "The address was removed."
 msgstr "Het adres was verwijderd."
 
-#: ../actions/userauthorization.php:311
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
@@ -1238,7 +2252,7 @@ msgstr ""
 "Loop de instructies van de site na voor details over hoe het abonnement te "
 "autoriseren. Je abonnement-token is:"
 
-#: ../actions/userauthorization.php:321
+#: ../actions/userauthorization.php:322
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
@@ -1248,25 +2262,30 @@ msgstr ""
 "de instructies van de site na voor details over hoe het abonnement volledig "
 "af te wijzen."
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Dit zijn de mensen die %s's berichten volgen."
 
-#: ../actions/subscribers.php:33
+#: ../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/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Dit zijn de mensen van wie %s de berichten volgt."
 
-#: ../actions/subscriptions.php:33
+#: ../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/recoverpassword.php:87
+#: ../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/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
 msgstr "Deze bevestigingscode is te oud. Begin alsjeblieft opnieuw."
 
@@ -1278,7 +2297,8 @@ msgstr ""
 "Dit formulier zou zichzelf automatisch moeten versturen. Zoniet, klik dan op "
 "de verstuurknop om naar je OpenID-provider te gaan."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../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 "
@@ -1289,44 +2309,90 @@ msgstr ""
 "koppelen aan een lokaal account. Je kunt ofwel een nieuw account aanmaken, "
 "ofwel koppelen aan je bestaande account, als je er al een hebt."
 
-#: ../lib/util.php:147
+#: ../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 "Deze pagina is niet beschikbaar in een mediatype dat jij accepteert"
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 "Om je te abonneren kun je [inloggen](%%action.login%%), of een nieuw account "
 "[registreren](%%action.register%%). Als je al een account op een "
 "[compatibele microblogging-site](%%doc.openmublog%%) hebt, voer dan "
 "hieronder je profiel-URL in."
 
-#: ../actions/profilesettings.php:51
+#: ../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 van je homepage, blog, of profiel op een andere site"
 
-#: ../actions/remotesubscribe.php:74
+#: ../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/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../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/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323
 msgid "Unexpected password reset."
 msgstr "Wachtwoord onverwacht teruggesteld."
 
+#: ../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 "Onbekende versie van het OMB-protocol."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1335,23 +2401,51 @@ msgstr ""
 "copyright van de auteurs en is beschikbaar onder de"
 
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Abonnement opheffen"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../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/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr "Niet ondersteund beeldbestandsformaat."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "Uploaden"
 
@@ -1367,59 +2461,126 @@ msgstr ""
 "vierkant is. Het moet ook onder site licentie vallen. Gebruik een afbeelding "
 "die je eigendom is en die je wilt delen."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../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 "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
 msgid "User being listened to doesn't exist."
 msgstr "Gebruiker waarnaar geluisterd wordt betaat niet."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../actions/foaf.php:47 ../actions/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/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "Gebruikersnaam"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../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/profilesettings.php:57
+#: ../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/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Foutief beeldbestandstype voor '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../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/finishaddopenid.php:64
+#: ../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 "Je hebt die OpenID al!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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 "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 ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Hier kun je je wachtwoord wijzigen. Kies een goede!"
 
-#: ../actions/register.php:164
+#: ../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/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/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -1429,46 +2590,80 @@ msgstr ""
 "te klikken."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Je kunt berichten verzenden en ontvangen via Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configureer je adres en instellingen hieronder.\n"
+"Je kunt berichten verzenden en ontvangen via Jabber/GTalk [instant messages]"
+"(%%doc.im%%). Configureer je adres en instellingen hieronder.\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 "Je kunt hier je persoonlijke profielinformatie bijwerken zodat mensen meer "
 "over je weten."
 
 #: ../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/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../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/updateprofile.php:62
+#: ../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/recoverpassword.php:134
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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 "Je bent geïdentificeerd. Vul hieronder een nieuw wachtwoord in."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "Je OpenID-URL"
 
-#: ../actions/recoverpassword.php:149
+#: ../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."
 
@@ -1479,1372 +2674,2210 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 "Met [OpenID](%%doc.openid%%) kun je op vele sites inloggen met hetzelfde "
-"gebruikersaccount. Hier kun je de aan je account gekoppelde OpenID's "
-"beheren."
+"gebruikersaccount. Hier kun je de aan je account gekoppelde OpenID's beheren."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "een paar seconden geleden"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "ongeveer %d dagen geleden"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "ongeveer %d uur geleden"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr "ongeveer %d minuten geleden"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr "ongeveer %d maanden geleden"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "ongeveer een dag geleden"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "ongeveer een minuut geleden"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "ongeveer een maand geleden"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "ongeveer een jaar geleden"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "ongeveer een uur geleden"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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 "in antwoord op..."
 
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "antwoord"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "gelijk aan wachtwoord hierboven"
 
-#: ../lib/util.php:1127
+#: ../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 "« Later"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
+#: 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/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: 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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
+msgid "%s favorite notices"
 msgstr ""
 
-#: ../actions/invite.php:168 actions/invite.php:176
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
+msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+#: 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:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
+#: actions/login.php:122 actions/login.php:264
+msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
+#: actions/login.php:126 actions/login.php:268
+msgid "Login with your username and password. "
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
+#: 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/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
+#: 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/register.php:213
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+msgid "No such user"
 msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
+#: actions/newmessage.php:117 actions/newmessage.php:67
+msgid "New message"
 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/noticesearch.php:95 actions/noticesearch.php:146
+msgid "Notice without matching profile"
 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/openidsettings.php:28 actions/openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+#: actions/outbox.php:53 actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+"Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
+msgid "You can update your personal profile info here "
 msgstr ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
+#: 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/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+msgid "This confirmation code is too old. "
 msgstr ""
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
 msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
 msgstr ""
 
-#: ../actions/register.php:202
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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...\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."
+"want to..."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: 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 "Could not follow user: %s is already on your list."
+msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
 msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
+#: actions/showstream.php:154
+msgid "Send a message"
 msgstr ""
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, php-format
+msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#, php-format
+msgid "Direct messages to %s"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
+msgid "No message text!"
 msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
+#: 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/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
-msgid "Feed for tag %s"
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
+#: 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 ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
+#: 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 ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+msgid "Twitter settings"
 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/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+msgid "Current verified Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
 msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
 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/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
+msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+msgid "Twitter settings saved."
 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/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
+msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
+#: 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/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+msgid "Twitter preferences saved."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
+msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
+msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+msgid "Command results"
 msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
+#: classes/Command.php:96 classes/Command.php:113
+#, php-format
+msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
+msgid "User has no last notice"
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
+#: classes/Command.php:146 classes/Command.php:166
+msgid "Notice marked as fave."
 msgstr ""
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
-msgid "Notices tagged with %s"
+msgid "Homepage: %s"
 msgstr ""
 
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
 msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
+#: classes/Command.php:295 classes/Command.php:335
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: 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:28 actions/register.php:28
-msgid "Registration not allowed."
+#: classes/Command.php:313 classes/Command.php:356
+msgid "Notification off."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
+#: classes/Message.php:53 classes/Message.php:56
+msgid "Could not insert message."
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
+#: classes/Message.php:63 classes/Message.php:66
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
 msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: lib/mail.php:253 lib/mail.php:512
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: lib/mailbox.php:43 lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: lib/openid.php:195 lib/openid.php:203
+msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+msgid "Favorites"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
 msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
 msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
+msgid "Twitter"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
+msgid "Twitter integration options"
 msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+msgid "Could not parse message."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s en vrienden"
+
+#: actions/avatarsettings.php:76
+msgid "You can upload your personal avatar."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Instellingen"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "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 ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
 msgstr ""
 
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
+#: actions/avatarsettings.php:334 actions/grouplogo.php:391
+#: classes/User_group.php:112
+#, fuzzy
+msgid "Lost our file."
+msgstr "Onbekend bericht."
+
+#: 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 ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "Onbekende gebruiker."
+
+#: actions/block.php:129
+msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/block.php:162
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Je bent al aangemeld!"
+
+#: 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 "Het adres was verwijderd."
+
+#: actions/deletenotice.php:73
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
 #, php-format
-msgid "Updates from %1$s on %2$s!"
+msgid "Edit %s group"
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: 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/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: 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/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/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:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
+#: 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/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/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/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Kon gebruiker niet actualiseren."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "Instellingen opgeslagen."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Fout bij bevestigingscode."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/emailsettings.php:321
+#, fuzzy
+msgid "That email address already belongs "
+msgstr "E-mailadres bestaat al."
+
+#: 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/facebookhome.php:110
+msgid "Server error - couldn't get user!"
+msgstr ""
+
+#: actions/facebookhome.php:196
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "If you would like the %s app to automatically update "
 msgstr ""
 
-#: ../lib/mail.php:147
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, 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 "Allow %s to update my Facebook status"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: actions/facebookhome.php:218
+msgid "Skip"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
+#: actions/facebookhome.php:235
+#, fuzzy
+msgid "No notice content!"
+msgstr "Geen inhoud!"
+
+#: 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
+#, fuzzy
+msgid "After"
+msgstr "« Later"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#, fuzzy
+msgid "Before"
+msgstr "Eerder »"
+
+#: actions/facebookinvite.php:70
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "Feed voor vrienden van %s"
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
 msgstr ""
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Kon gebruiker niet actualiseren."
+
+#: actions/facebooksettings.php:65
+msgid "There was a problem saving your sync preferences!"
 msgstr ""
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Voorkeuren opgeslagen."
+
+#: actions/facebooksettings.php:90
+msgid "Automatically update my Facebook status with my notices."
 msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Favor"
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Profiel"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
 msgstr ""
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Voorkeuren"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+#, fuzzy
+msgid "Popular notices"
+msgstr "Onbekend bericht."
+
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Onbekend bericht."
+
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/featured.php:71
 #, php-format
-msgid "%s favorite notices"
+msgid "Featured users, page %d"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/featured.php:99
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/inbox.php:28
-#, php-format
-msgid "Inbox for %s - page %d"
+#: actions/finishremotesubscribe.php:188
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/inbox.php:30
-#, php-format
-msgid "Inbox for %s"
+#: actions/groupbyid.php:79
+msgid "No ID"
 msgstr ""
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+msgid "Group logo"
 msgstr ""
 
-#: actions/invite.php:178
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Avatar geactualiseerd."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Actualiseren avatar niet gelukt."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: actions/login.php:126
-msgid "Login with your username and password. "
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
 msgstr ""
 
-#: actions/newmessage.php:65
-msgid "No recipient specified."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
+#: actions/groups.php:90
+#, php-format
+msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#, fuzzy
+msgid "Create a new group"
+msgstr "Maak een nieuw account aan"
+
+#: actions/groupsearch.php:57
+#, fuzzy, php-format
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
+"Zoek naar mensen op %%site.name%% op basis van hun naam, locatie of "
+"interesses. Scheid de zoektermen met spaties; ze moeten uit 3 of meer tekens "
+"bestaan."
 
-#: actions/newmessage.php:108
-msgid "No such user"
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "Personen zoeken"
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
 msgstr ""
 
-#: actions/newmessage.php:117
-msgid "New message"
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
 msgstr ""
 
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
+#: actions/imsettings.php:147
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk "
+msgstr "Stuur mij berichten via Jabber/GTalk."
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Geen bevestigingscode."
+
+#: actions/joingroup.php:65
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/openidsettings.php:28
+#: actions/joingroup.php:95
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Je bent al aangemeld!"
+
+#: actions/joingroup.php:128
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Kon niet omleiden naar server: %s"
+
+#: actions/joingroup.php:135
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgid "%s joined group %s"
 msgstr ""
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/leavegroup.php:65
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "Onbekend bericht."
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Je hebt dat profiel niet ingezonden"
+
+#: actions/leavegroup.php:100
+msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/outbox.php:28
-#, php-format
-msgid "Outbox for %s - page %d"
+#: actions/leavegroup.php:130
+msgid "Could not find membership record."
 msgstr ""
 
-#: actions/outbox.php:30
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Kon niet omleiden naar server: %s"
+
+#: actions/leavegroup.php:145
 #, php-format
-msgid "Outbox for %s"
+msgid "%s left group %s"
 msgstr ""
 
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
 msgstr ""
 
-#: actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
+#: actions/newgroup.php:177
+#, fuzzy
+msgid "Could not create group."
+msgstr "Kon avatarinformatie niet opslaan"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Kon abonnement niet aanmaken."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "Dat bestand is te groot."
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "Berichten"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
 msgstr ""
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
+#: actions/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "Log in met OpenID"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Verwijder OpenID"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Instellingen"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
 msgstr ""
 
-#: actions/register.php:216
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "Zoeken"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Locatie is te lang (maximaal 255 tekens)."
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Wijzig wachtwoord"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "Wachtwoord opgeslagen."
+
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Geen geldig e-mailadres."
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:91
 #, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "Profiel onbekend"
+
+#: actions/profilesettings.php:124
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/profilesettings.php:144
+msgid "Automatically subscribe to whoever "
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: actions/profilesettings.php:229 actions/tagother.php:176
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ongeldige homepage '%s'"
+
+#: actions/profilesettings.php:311
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Kon profiel niet opslaan."
+
+#: actions/public.php:107
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Openbare tijdlijn"
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/public.php:220
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
 
-#: actions/showfavorites.php:61
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Openbare stream-feed"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Feed for favorites of %s"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/showmessage.php:33
-msgid "No such message."
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/register.php:149
+#, fuzzy
+msgid "You can't register if you don't "
+msgstr "Je kunt niet registreren als je niet met de licentie akkoord gaat."
+
+#: actions/register.php:286
+msgid "With this form you can create "
 msgstr ""
 
-#: actions/showmessage.php:61
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: actions/register.php:368
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, "
+msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
+
+#: actions/register.php:382 actions/register.php:386
+#, fuzzy
+msgid "Used only for updates, announcements, "
+msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
+
+#: actions/register.php:398
+#, fuzzy
+msgid "URL of your homepage, blog, "
+msgstr "URL van je homepage, blog, of profiel op een andere site"
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Beschrijf jezelf en je interesses in 140 tekens"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "Waar je bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
 msgstr ""
+" behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
+"telefoonnummer."
 
-#: actions/showmessage.php:66
+#: actions/register.php:471
 #, php-format
-msgid "Message from %1$s on %2$s"
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: 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/smssettings.php:312
+#: actions/replies.php:118
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Antwoorden aan %s"
+
+#: actions/showfavorites.php:79
 #, php-format
-msgid "Mobile carrier for your phone. "
+msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
-msgid "Direct messages to %s"
+msgid "%s group"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/showgroup.php:79
 #, php-format
-msgid "All the direct messages sent to %s"
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
+#: actions/showgroup.php:206
+#, fuzzy
+msgid "Group profile"
+msgstr "Onbekend bericht."
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
+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 "Berichten"
+
+#: actions/showgroup.php:270
+msgid "Group actions"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Berichten-feed voor %s"
+
+#  String should contain a variable token for since 'when'
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
+msgid "Members"
+msgstr "Lid sinds"
+
+#: 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/showgroup.php:370
+msgid "All members"
+msgstr ""
+
+#: actions/showgroup.php:378
 #, php-format
-msgid "All the direct messages sent from %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Profiel"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "Gebruiker heeft geen profiel."
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Abonnees"
+
+#: actions/showstream.php:533
+msgid "All groups"
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/showstream.php:542
 #, php-format
-msgid "%s / Favorites from %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/smssettings.php:128
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, "
+msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
+
+#: actions/smssettings.php:162
+#, fuzzy
+msgid "Send me notices through SMS; "
+msgstr "Stuur mij berichten via Jabber/GTalk."
+
+#: actions/smssettings.php:335
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. "
+msgstr "Die bevestigingscode is niet voor jou!"
+
+#: actions/smssettings.php:453
+msgid "Mobile carrier"
+msgstr ""
+
+#: actions/subedit.php:70
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Je hebt dat profiel niet ingezonden"
+
+#: actions/subedit.php:83
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Kon abonnement niet aanmaken."
+
+#: actions/subscribe.php:55
+#, fuzzy
+msgid "Not a local user."
+msgstr "Onbekende gebruiker."
+
+#: actions/subscribe.php:69
+#, fuzzy
+msgid "Subscribed"
+msgstr "Abonneren"
+
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Abonnees"
+
+#: actions/subscribers.php:52
 #, php-format
-msgid "%s updates favorited by %s / %s."
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/subscribers.php:63
+#, fuzzy
+msgid "These are the people who listen to "
+msgstr "Dit zijn de mensen die %s's berichten volgen."
+
+#: actions/subscribers.php:67
+#, fuzzy, php-format
+msgid "These are the people who "
+msgstr "Dit zijn de mensen die %s's berichten volgen."
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Alle abonnementen"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Alle abonnementen"
+
+#: actions/subscriptions.php:65
+#, fuzzy
+msgid "These are the people whose notices "
+msgstr "Dit zijn de mensen van wie %s de berichten volgt."
+
+#: actions/subscriptions.php:69
+#, fuzzy, php-format
+msgid "These are the people whose "
+msgstr "Dit zijn de mensen die %s's berichten volgen."
+
+#: actions/subscriptions.php:122
+#, fuzzy
+msgid "Jabber"
+msgstr "Geen Jabber-ID."
+
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Microblog van %s"
+
+#: actions/tag.php:66
 #, php-format
-msgid "%s added your notice as a favorite"
+msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/tagother.php:33
+#, fuzzy
+msgid "Not logged in"
+msgstr "Niet ingelogd."
+
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No id argument."
+msgstr "Onbekend document."
+
+#: actions/tagother.php:65
 #, php-format
+msgid "Tag %s"
+msgstr ""
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr ""
+
+#: actions/tagother.php:149
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/tagother.php:164
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/tagother.php:191
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
+#: actions/tagother.php:198
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Kon avatarinformatie niet opslaan"
+
+#: actions/tagother.php:233
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "Onbekend bericht."
+
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Microblog van %s"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
 msgstr ""
 
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "Geen verzoek gevonden!"
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Nieuw wachtwoord"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
 msgstr ""
 
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
 msgstr ""
 
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
+#: actions/twittersettings.php:341
+#, fuzzy, php-format
+msgid "Unable to retrieve account information "
+msgstr "Kon e-mailbevestiging niet verwijderen."
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Fout bij opslaan van de gebruiker."
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Geen profiel-URL teruggestuurd door de server."
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Profiel op afstand zonder overeenkomend profiel"
+
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Abonnement opheffen"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
 msgstr ""
 
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Probleem bij opslaan bericht."
+
+#: classes/Notice.php:109
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Actualiseren avatar niet gelukt."
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr ""
+
+#: lib/action.php:130
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgid "%s - %s"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
+#: lib/action.php:145
+msgid "Untitled page"
 msgstr ""
 
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
+#: lib/action.php:316
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
+#: lib/action.php:325
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
+#  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/action.php:328
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
+#: lib/action.php:332
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
+#: lib/action.php:335
+msgid "Login to the site"
 msgstr ""
 
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Maak een nieuw account aan"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "Die OpenID is niet bekend."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Help"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "Nieuw bericht"
+
+#: lib/action.php:417
+msgid "Local views"
 msgstr ""
 
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "Nieuw bericht"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Abonnementen"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
 msgstr ""
 
-#: classes/Channel.php:113
-msgid "Command results"
+#: lib/action.php:630
+msgid "All "
 msgstr ""
 
-#: classes/Channel.php:148
-msgid "Command complete"
+#: lib/action.php:635
+msgid "license."
 msgstr ""
 
-#: classes/Channel.php:158
-msgid "Command failed"
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Onbekende gebruiker."
+
+#: lib/blockform.php:153
+msgid "Block"
 msgstr ""
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
 msgstr ""
 
-#: classes/Command.php:96
+#: lib/facebookaction.php:268
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
+#: lib/facebookaction.php:271
+#, fuzzy
+msgid " a new account."
+msgstr "Maak een nieuw account aan"
+
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#, fuzzy
+msgid "Published"
+msgstr "Openbaar"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
+msgid "Favor this notice"
+msgstr "Onbekend bericht."
+
+#: lib/feedlist.php:64
+msgid "Export data"
 msgstr ""
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
+#: lib/galleryaction.php:121
+msgid "Filter tags"
 msgstr ""
 
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
+#: lib/galleryaction.php:131
+msgid "All"
 msgstr ""
 
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
+#: lib/galleryaction.php:137
+msgid "Tag"
 msgstr ""
 
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
+#: lib/galleryaction.php:139
+msgid "Go"
 msgstr ""
 
-#: classes/Command.php:178
-#, php-format
-msgid "About: %s"
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "URL van je homepage, blog, of profiel op een andere site"
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Abonnementen"
+
+#: 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:158
+#, fuzzy
+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 ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
 msgstr ""
 
-#: classes/Command.php:200
+#: lib/groupnav.php:101
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Edit %s group properties"
 msgstr ""
 
-#: classes/Command.php:214
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Uitloggen"
+
+#: lib/groupnav.php:107
 #, php-format
-msgid "Direct message to %s sent"
+msgid "Add or edit %s logo"
 msgstr ""
 
-#: classes/Command.php:216
-msgid "Error sending direct message."
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
 msgstr ""
 
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
 msgstr ""
 
-#: classes/Command.php:270
+#: lib/grouptagcloudsection.php:56
 #, php-format
-msgid "Subscribed to %s"
+msgid "Tags in %s group's notices"
 msgstr ""
 
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
+#: 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"
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Inloggen"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Opslaan"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Ongeldige gebruikersnaam of wachtwoord."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Maak een nieuw account aan"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
 msgstr ""
 
-#: classes/Command.php:295
+#: lib/mail.php:175
 #, php-format
-msgid "Unsubscribed from %s"
+msgid ""
+"Hey, %s.\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
-msgstr ""
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s volgt nu je berichten op %2$s."
 
-#: classes/Command.php:313
-msgid "Notification off."
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Locatie"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Homepage"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:315
-msgid "Can't turn off notification."
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
 msgstr ""
 
-#: classes/Command.php:333
-msgid "Notification on."
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr ""
 
-#: classes/Command.php:335
-msgid "Can't turn on notification."
+#: 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/mailbox.php:229 lib/noticelist.php:380
+#, fuzzy
+msgid "From"
+msgstr " van "
+
+#: lib/messageform.php:110
+msgid "Send a direct notice"
 msgstr ""
 
-#: classes/Command.php:344
-msgid "Commands:\n"
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "Nieuw bericht"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 of meer tekens"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "in antwoord op..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
 msgstr ""
 
-#: classes/Message.php:53
-msgid "Could not insert message."
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "antwoord"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+msgid "Delete this notice"
 msgstr ""
 
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
+#: lib/noticelist.php:474
+msgid "Delete"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
 msgstr ""
 
-#: lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: lib/nudgeform.php:128
+msgid "Nudge"
 msgstr ""
 
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/personaltagcloudsection.php:56
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
+#: lib/profilelist.php:182
+msgid "(none)"
 msgstr ""
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
-msgstr ""
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Openbaar"
 
-#: lib/personal.php:65
-msgid "Favorites"
+#: lib/publicgroupnav.php:80
+msgid "User groups"
 msgstr ""
 
-#: lib/personal.php:66
-#, php-format
-msgid "%s's favorite notices"
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
 msgstr ""
 
-#: lib/personal.php:66
-msgid "User"
+#: lib/publicgroupnav.php:86
+msgid "Featured"
 msgstr ""
 
-#: lib/personal.php:75
-msgid "Inbox"
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "Personen zoeken"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Berichten"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
 msgstr ""
 
-#: lib/personal.php:76
-msgid "Your incoming messages"
+#: lib/section.php:89
+msgid "Untitled section"
 msgstr ""
 
-#: lib/personal.php:80
-msgid "Outbox"
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Abonneren op afstand"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Abonneren op afstand"
+
+#: lib/subgroupnav.php:97
+#, php-format
+msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/personal.php:81
-msgid "Your sent messages"
+#: lib/subgroupnav.php:104
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/settingsaction.php:99
-msgid "Twitter"
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Gebruiker heeft geen profiel."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Abonnement geautoriseerd"
+
+#: lib/tagcloudsection.php:56
+msgid "None"
 msgstr ""
 
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
+#: lib/topposterssection.php:74
+msgid "Top posters"
 msgstr ""
 
-#: lib/util.php:1718
-msgid "To"
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "Onbekende gebruiker."
+
+#: lib/unblockform.php:150
+msgid "Unblock"
 msgstr ""
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "Maak een nieuw account aan"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Kon e-mail niet bevestigen."
+
+#~ msgid "Email address"
+#~ msgstr "E-mailadres"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Fout bij toevoegen bericht"
+
+#~ 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."
diff --git a/locale/nn_NO/LC_MESSAGES/laconica.mo b/locale/nn_NO/LC_MESSAGES/laconica.mo
new file mode 100644
index 000000000..63b730aff
--- /dev/null
+++ b/locale/nn_NO/LC_MESSAGES/laconica.mo
diff --git a/locale/nn_NO/LC_MESSAGES/laconica.po b/locale/nn_NO/LC_MESSAGES/laconica.po
new file mode 100644
index 000000000..dca3c60a4
--- /dev/null
+++ b/locale/nn_NO/LC_MESSAGES/laconica.po
@@ -0,0 +1,4894 @@
+# nn_NO translation of Laconica.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Laconica 0.6.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-01-28 13:27+0000\n"
+"Last-Translator: Simon Hansen <simonboba@gmail.com>\n"
+"Language-Team: Norwegian/Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"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 nedonfor 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"
+
+#: ../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/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 offentlege straum"
+
+#: ../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 med vener"
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33
+#, php-format
+msgid "%s public timeline"
+msgstr "%s offentleg tidsline"
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#, 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"
+msgstr "%s tidsline"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, 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.)"
+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
+#, 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/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
+#, php-format
+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/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
+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 ""
+"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/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 "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/twitapilaconica.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/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
+#, 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?"
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
+#: actions/userauthorization.php:81
+msgid "Authorize subscription"
+msgstr "Autoriser tinging"
+
+#: ../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/profilesettings.php:65 actions/profilesettings.php:98
+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)"
+
+#: ../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/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 ""
+"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
+#, fuzzy
+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/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/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"
+
+#: ../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/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
+msgid "Cannot normalize that Jabber ID"
+msgstr "Klarar ikkje normalisera Jabber-IDen"
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr "Klarar ikkje normalisera epostadressa"
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
+msgid "Change"
+msgstr "Endra"
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr "Endra eposthandtering"
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Endra passord"
+
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+msgid "Change your password"
+msgstr "Endra passordet ditt"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: lib/accountsettingsaction.php:105
+msgid "Change your profile settings"
+msgstr "Endra profilinnstillingane dine"
+
+#: ../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/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Stadfest 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 "Stadfesting avbrutt."
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr "Stadfestingskode"
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Fann ikkje stadfestingskode."
+
+#: ../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."
+msgstr ""
+"Gratulerer, %s! Velkomen til %%%%site.name%%%%. Du vil kanhenda...\n"
+"\n"
+"* GÃ¥ til [profilen din](%s) og "
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
+msgid "Connect"
+msgstr "Kopla til"
+
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
+msgid "Connect existing account"
+msgstr "Kopla til eksisterande konto"
+
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+msgid "Contact"
+msgstr "Kontakt"
+
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#, php-format
+msgid "Could not create OpenID form: %s"
+msgstr "Kunne ikkje laga OpenID-form: %s"
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "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."
+msgstr "Fann ikkje brukaren, so han kan ikkje fylgjast"
+
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#, php-format
+#, fuzzy
+msgid "Could not redirect to server: %s"
+msgstr "Kan ikkje "
+
+#: ../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 epostadresse."
+
+#: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Couldn't convert request tokens to access tokens."
+msgstr "Kan ikkje konvertera spyrje"
+
+#: ../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 epostgodkjenning."
+
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+msgid "Couldn't delete subscription."
+msgstr "Kan ikkje sletta tinging."
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:84
+msgid "Couldn't find any statuses."
+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/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
+msgid "Create"
+msgstr "Lag"
+
+#: ../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/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
+msgid "Create new account"
+msgstr "Opprett ny konto"
+
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:231
+msgid "Creating new account for OpenID that already has a user."
+msgstr "Oppretter ny konto for OpenID som allereie har ein brukar."
+
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Stadfesta Jabber/Gtalk-adresse."
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Godkjent mobiltelefonnummer."
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+#: actions/emailsettings.php:99
+msgid "Current confirmed email address."
+msgstr "Godkjent epostadresse."
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+msgid "Currently"
+msgstr "Noverande"
+
+#: ../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"
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#, 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"
+
+#: ../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/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/userauthorization.php:137 actions/userauthorization.php:144
+#: actions/userauthorization.php:161
+msgid "Error authorizing token"
+msgstr "Feil ved godkjenning av billett."
+
+#: ../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/finishaddopenid.php:78 actions/finishaddopenid.php:78
+#: actions/finishaddopenid.php:126
+msgid "Error connecting user."
+msgstr "Feil ved å kopla til brukar."
+
+#: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+msgid "Error inserting avatar"
+msgstr "Feil med innhenting av brukarbilete."
+
+#: ../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/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+msgid "Error inserting remote profile"
+msgstr "Feil med å henta inn ekstern profil"
+
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
+msgid "Error saving address confirmation."
+msgstr "Feil med lagring av adressestadfesting."
+
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
+msgid "Error saving remote profile"
+msgstr "Feil med lagring av ekstern profil"
+
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+msgid "Error saving the profile."
+msgstr "Feil ved lagring av profil"
+
+#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+msgid "Error saving the user."
+msgstr "Feil ved lagring av brukar"
+
+#: ../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/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/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
+msgid "Error updating profile"
+msgstr "Feil ved oppdatering av profil"
+
+#: ../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/recoverpassword.php:80 actions/recoverpassword.php:80
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Feil med stadfestingskode."
+
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
+msgid "Existing nickname"
+msgstr "Kallenamnet eksisterer"
+
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+msgid "FAQ"
+msgstr "OSS"
+
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
+msgid "Failed updating avatar."
+msgstr "Feil ved oppdatering av brukarbilete."
+
+#: ../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 "Straum for vener av %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 "Straum for svar til %s"
+
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, 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"
+
+#: ../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/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/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
+#, php-format
+msgid "Invalid avatar URL '%s'"
+msgstr "Ugyldig brukarbilete-nettadresse «%s»"
+
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Ugyldig epostadresse: «%s»"
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
+#, php-format
+msgid "Invalid homepage '%s'"
+msgstr "Ugyldig heimeside «%s»"
+
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
+#, 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"
+
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72
+msgid "Invalid notice uri"
+msgstr "Ugyldig notis-adresse"
+
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
+msgid "Invalid notice url"
+msgstr "Ugyldig notis-adresse"
+
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
+#, php-format
+msgid "Invalid profile URL '%s'."
+msgstr "Ugyldig profil-netadresse «%s»"
+
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135
+msgid "Invalid profile URL (bad format)"
+msgstr "Ugyldig profil-netadresse (feil format)"
+
+#: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
+msgid "Invalid profile URL returned by server."
+msgstr "Ugyldig profil-netadresse returnert av tenar."
+
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Den køyrer [Laconica](http://laconi.ca) 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/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/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/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/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/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/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%"
+"%)."
+
+#: ../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 namn, fortrinnsvis ditt «ekte» namn"
+
+#: ../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/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/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/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:480
+msgid "Member since"
+msgstr "Medlem sidan"
+
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#, php-format
+msgid "Microblog by %s"
+msgstr "Mikroblogg av %s"
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+"Mobiloperatøren din. Ta kontakt på %s viss du kjenner ein mobiloperatør som "
+"aksepterer SMS-over-epost, men ikkje vistast her."
+
+#: ../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/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 epostadresse for å oppdatera %s"
+
+#: ../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/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+#: actions/finishopenidlogin.php:99
+msgid "New nickname"
+msgstr "Nytt kallenamn"
+
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
+msgid "New notice"
+msgstr "Ny notis"
+
+#: ../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."
+msgstr "Lagra det nye passordet. Du er logga inn."
+
+#: ../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/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/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/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
+msgid "Nickname not allowed."
+msgstr "Kallenamnet er ikkje gyldig."
+
+#: ../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/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
+msgid "Nickname or email"
+msgstr "Kallenamn eller epostadresse"
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
+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/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
+msgid "No authorization request!"
+msgstr "Ingen autoriserings-spørjing!"
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+#: actions/smssettings.php:299
+msgid "No carrier selected."
+msgstr "Ingen mobiloperatør vald."
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+#: actions/smssettings.php:486
+msgid "No code entered"
+msgstr "Ingen innskriven kode"
+
+#: ../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/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
+msgid "No profile URL returned by server."
+msgstr "Ingen profil-netadresse returnert av tenar."
+
+#: ../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/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
+msgid "No request found!"
+msgstr "Fann ingen spørjing."
+
+#: ../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/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Ingen storleik."
+
+#: ../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/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/openidsettings.php:135 actions/openidsettings.php:144
+#: actions/openidsettings.php:222
+msgid "No such OpenID."
+msgstr "Fann ingen slik OpenID."
+
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+msgid "No such document."
+msgstr "Slikt dokument finst ikkje."
+
+#: ../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 "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 "Tingingi 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/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/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/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
+msgid "Not an image or corrupt file."
+msgstr "Korrupt bilete."
+
+#: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
+msgid "Not authorized."
+msgstr "Ikkje autorisert."
+
+#: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+msgid "Not expecting this response!"
+msgstr "Venta ikkje dette svaret!"
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:309
+msgid "Not found"
+msgstr "Fann ikkje"
+
+#: ../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"
+
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+msgid "Not subscribed!."
+msgstr "Ikkje tinga."
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Notissøk"
+
+#: ../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 "Notisstraum for %s"
+
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:94
+msgid "Notice has no profile"
+msgstr "Notisen har ingen 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 "Notisar"
+
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
+msgid "Old password"
+msgstr "Gamalt 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/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/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
+msgid "Partial upload."
+msgstr "Hallvegs opplasta."
+
+#: ../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/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/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/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/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/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."
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Folk"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Søk etter folk"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Søk etter folk"
+
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+msgid "Personal"
+msgstr "Personleg"
+
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr "Personleg melding"
+
+#: ../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/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/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: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 "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/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
+msgid "Profile settings"
+msgstr "Profilinnstillingar"
+
+#: ../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/public.php:54 actions/public.php:54 actions/public.php:124
+msgid "Public Stream Feed"
+msgstr "Offentleg straum"
+
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
+msgid "Public timeline"
+msgstr "Offentleg tidsline"
+
+#: ../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:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+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/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr "Registreringa gikk bra"
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
+msgid "Reject"
+msgstr "Avslå"
+
+#: ../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/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/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
+msgid "Remote subscribe"
+msgstr "Eksternt abbonement"
+
+#: ../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
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+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."
+
+#: ../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
+#, 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 "Avbryt"
+
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
+msgid "Reset password"
+msgstr "Tilbakestill passord"
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr "SMS telefon nummer"
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS innstillingar"
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr "SMS bekreftelse"
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
+msgid "Same as password above"
+msgstr "Samme passord som over"
+
+#: ../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/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"
+
+#: ../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/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
+msgid "Search Stream Feed"
+msgstr "Søk i straum"
+
+#: ../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 ""
+"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
+#, 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 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/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."
+msgstr "Send epost til denne addressa for å legge til nye notisar."
+
+#: ../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/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/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/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å."
+
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+msgid "Settings"
+msgstr "Innstillingar"
+
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
+msgid "Settings saved."
+msgstr "Lagra innstillingar."
+
+#: ../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/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/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."
+
+#: ../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."
+
+#: ../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."
+
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+msgid "Source"
+msgstr "Kjeldekode"
+
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
+msgid "Statistics"
+msgstr "Statistikk"
+
+#: ../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/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/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/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
+msgid "Subscription authorized"
+msgstr "Tinging autorisert"
+
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
+msgid "Subscription rejected"
+msgstr "Tinging avvist"
+
+#: ../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/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
+msgid "System error uploading file."
+msgstr "Systemfeil ved opplasting av fil."
+
+#: ../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"
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr "Tekst"
+
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:67
+msgid "Text search"
+msgstr "Tekstsøk"
+
+#: ../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/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/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/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/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
+msgid "That file is too big."
+msgstr "Fila er for stor."
+
+#: ../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/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/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/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/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/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/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/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/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/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/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/confirmaddress.php:92 actions/confirmaddress.php:92
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Addressa \"%s\" har blitt bekrefta for din konto."
+
+#: ../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/userauthorization.php:312
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site's instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+
+#: ../actions/userauthorization.php:322
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site's instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "Dette er folk som lyttar til %s's notisar"
+
+#: ../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/subscriptions.php:35 actions/subscriptions.php:35
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr ""
+
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+msgid "These are the people whose notices you listen to."
+msgstr "Dette er dei du lyttar til."
+
+#: ../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 ""
+"Desse er alt brukarar og du var automatisk satt opp med tinging på dei:"
+
+#: ../actions/recoverpassword.php:88
+msgid "This confirmation code is too old. Please start again."
+msgstr "Denne godkjenningskoden er for gammal. Vennligst start på nytt."
+
+#: ../lib/openid.php:195
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
+#: 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 ""
+
+#: ../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"
+msgstr "Tidssone"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:43
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: 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 ""
+
+#: ../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 ""
+
+#: ../lib/util.php:269 lib/util.php:285
+msgid ""
+"Unless otherwise specified, contents of this site are copyright by the "
+"contributors and available under the "
+msgstr ""
+
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
+msgid "Unsupported image file format."
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "Lasta 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."
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr "Last opp eit nytt brukarbilete"
+
+#: ../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 ""
+
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
+msgid "User nickname"
+msgstr "Brukaren sitt kallenamn"
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#, php-format
+msgid "What's up, %s?"
+msgstr "Kva skjer %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 "Kvar er du, t.d. «Stavanger, Rogaland, Noreg»"
+
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
+#, php-format
+msgid "Wrong image type for '%s'"
+msgstr ""
+
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
+#, 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
+msgid "Yes"
+msgstr "Ja"
+
+#: ../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!"
+msgstr "Du er allereie innlogga."
+
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/password.php:27
+msgid "You can change your password here. Choose a good one!"
+msgstr ""
+
+#: ../actions/register.php:135 actions/register.php:145
+msgid "You can create a new account to start posting notices."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../actions/openidsettings.php:86
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+
+#: ../actions/profilesettings.php:27
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: 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
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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 "Din OpenID"
+
+#: ../actions/recoverpassword.php:164
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+
+#: ../actions/openidsettings.php:28
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
+"account.  Manage your associated OpenIDs from here."
+msgstr ""
+
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+msgid "a few seconds ago"
+msgstr "eit par sekund sidan"
+
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#, php-format
+msgid "about %d days ago"
+msgstr "~%d dagar sidan"
+
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#, php-format
+msgid "about %d hours ago"
+msgstr "~%d timar sidan"
+
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#, php-format
+msgid "about %d minutes ago"
+msgstr "~%d minutt sidan"
+
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#, 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"
+
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+msgid "about an hour ago"
+msgstr "omtrent ein time sidan"
+
+#: ../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/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 "« Etter"
+
+#: 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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Innboks for %s - side %d"
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr "Innboks for %s"
+
+#: actions/inbox.php:53 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"
+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/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 ""
+
+#: 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 "Ny melding"
+
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28 actions/openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53 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 ""
+
+#: 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 ""
+
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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
+#, php-format
+msgid "Feed for favorites of %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 ""
+
+#: 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/showmessage.php:61 actions/showmessage.php:108
+#, 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"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr "Send ei melding"
+
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, 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"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#, 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"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, 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 "Inga meldingstekst!"
+
+#: 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."
+msgstr ""
+
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#, php-format
+msgid "%s updates favorited by %s / %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 ""
+
+#: 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 ""
+
+#: 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 "Twitter-innstillingar"
+
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
+msgstr "Twitterkonto"
+
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+msgid "Current verified Twitter account."
+msgstr "Noverande verifisert Twitterkonto"
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr "Brukarnamn på twitter"
+
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
+msgstr "Inga mellomrom."
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr "Passord på Twitter"
+
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+msgid "Automatically send my notices to Twitter."
+msgstr "Send mine notisar til Twitter."
+
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Send lokale «@»-svar til Twitter."
+
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+msgid "Subscribe to my Twitter friends here."
+msgstr "Ting mine twitter-vener her."
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+"Brukarnamn må berre ha nummer, understrek (_), store og små bokstavar."
+"Maksimalt 15 teikn."
+
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
+msgstr "Twitter-informasjonen fungerer ikkje mot Twitter."
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: 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 "Lagra Twitter-innstillingar."
+
+#: actions/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."
+msgstr "Det er ikkje Twitter-kontoen din."
+
+#: 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/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
+msgstr "Fjerna Twitter-brukar."
+
+#: 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/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 ""
+
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96 classes/Command.php:113
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr "Tingingar: %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 "Brukaren har ikkje siste notis"
+
+#: classes/Command.php:146 classes/Command.php:166
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
+msgstr "Fullt namn: %s"
+
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
+msgstr "Stad: %s"
+
+#: classes/Command.php:175 classes/Command.php:198
+#, php-format
+msgid "Homepage: %s"
+msgstr "Heimeside: %s"
+
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
+msgstr "Om: %s"
+
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Tingar %s"
+
+#: 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
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Tingar ikkje %s lengre"
+
+#: 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 "Notifikasjon av."
+
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
+msgstr "Kan ikkje skru av notifikasjon."
+
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
+msgstr "Notifikasjon på."
+
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
+msgstr "Kan ikkje slå på notifikasjon."
+
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
+msgstr "Komandoar:\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 ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253 lib/mail.php:512
+#, 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."
+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
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
+msgstr "Brukar"
+
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
+msgstr "Innboks"
+
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
+msgstr "Dine innkomande meldinger"
+
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
+msgstr "Utboks"
+
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
+msgstr "Dine sende meldingar"
+
+#: 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 integrerings-innstillingar"
+
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
+msgstr "Til"
+
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Kunne ikkje prosessera melding."
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s med vener"
+
+#: actions/avatarsettings.php:76
+msgid "You can upload your personal avatar."
+msgstr ""
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Twitter-innstillingar"
+
+#: 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
+#, fuzzy
+msgid "Lost our file."
+msgstr "Denne notisen finst ikkje."
+
+#: 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
+#, fuzzy
+msgid "No profile specified."
+msgstr "Ingen mobiloperatør vald."
+
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "Fann ingen status med den ID-en."
+
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "Brukaren finst ikkje."
+
+#: actions/block.php:129
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "Sikker på at du vil sletta notisen?"
+
+#: actions/block.php:162
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Du er allereie innlogga."
+
+#: 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 "Addressa blei fjerna."
+
+#: actions/deletenotice.php:73
+#, fuzzy
+msgid "You are about to permanently delete a notice. "
+msgstr "Sikker på at du vil sletta notisen?"
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
+#, 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"
+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
+#, fuzzy
+msgid "No nickname"
+msgstr "Ingen kallenamn."
+
+#: 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 "Denne notisen finst ikkje."
+
+#: 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 ""
+
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
+msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom."
+
+#: actions/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "«Om meg» er for lang (maks 140 "
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Kan ikkje oppdatera brukar."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "Lagra innstillingar."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Ventar på godkjenning for dette telefonnummeret."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#, fuzzy
+msgid "Make a new email address for posting to; "
+msgstr "Ny epostadresse for å oppdatera %s"
+
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
+msgstr ""
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/emailsettings.php:321
+#, fuzzy
+msgid "That email address already belongs "
+msgstr "Den epost addressa er alt registrert hos ein annan brukar."
+
+#: actions/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
+msgstr ""
+"Sendte konfirmasjonskode til ljonmeldingsadressa du la til. Du må godtaka %"
+"sfor å senda meldinger til deg."
+
+#: 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 ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, 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 "Ingen innhald."
+
+#: 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
+#, fuzzy
+msgid "After"
+msgstr "« Etter"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#, fuzzy
+msgid "Before"
+msgstr "Før »"
+
+#: actions/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:72
+#, fuzzy
+msgid "Invitations have been sent to the following users:"
+msgstr "Invitasjon(er) sendt til fylgjande folk:"
+
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
+msgstr ""
+
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "Straum for vener av %s"
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
+msgstr ""
+
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Kunne ikkje fjerna Twitter-brukar."
+
+#: actions/facebooksettings.php:65
+msgid "There was a problem saving your sync preferences!"
+msgstr ""
+
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Lagra brukarval."
+
+#: actions/facebooksettings.php:90
+#, fuzzy
+msgid "Automatically update my Facebook status with my notices."
+msgstr "Send mine notisar til Twitter."
+
+#: actions/facebooksettings.php:97
+#, fuzzy
+msgid "Send \"@\" replies to Facebook."
+msgstr "Send lokale «@»-svar til Twitter."
+
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Profil"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
+msgstr ""
+
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Brukarval"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+#, fuzzy
+msgid "Popular notices"
+msgstr "Denne notisen finst ikkje."
+
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Denne notisen finst ikkje."
+
+#: actions/favorited.php:79
+#, fuzzy
+msgid "The most popular notices on the site right now."
+msgstr "Viser dei mest populære merkelappane fra siste veka"
+
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+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/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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Lasta opp brukarbilete."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Feil ved oppdatering av brukarbilete."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+msgstr ""
+
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#, fuzzy
+msgid "Create a new group"
+msgstr "Opprett ny konto"
+
+#: actions/groupsearch.php:57
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+msgstr ""
+"Søk for mennesker på %%site.name%% i namn, lokasjon eller interesse. Separer "
+"nøkkelord med mellomrom; dei må være minimum 3 bokstavar eller meir."
+
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "Søk etter folk"
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
+msgstr ""
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk "
+msgstr "Send meg ein notis via Jabber/GTalk."
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Ingen stadfestingskode."
+
+#: actions/joingroup.php:65
+msgid "You must be logged in to join a group."
+msgstr ""
+
+#: actions/joingroup.php:95
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Du er allereie innlogga."
+
+#: actions/joingroup.php:128
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Fann ikkje brukaren, so han kan ikkje fylgjast"
+
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "No such group."
+msgstr "Denne notisen finst ikkje."
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Kan ikkje tinga andre til deg."
+
+#: actions/leavegroup.php:100
+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 "Kan ikkje oppdatera brukarinformajon."
+
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Fann ikkje brukaren, so han kan ikkje fylgjast"
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "Could not create group."
+msgstr "Kan ikkje lagra brukarbilete-informasjon"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Kan ikkje sletta tinging."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "Fila er for stor."
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
+msgstr ""
+
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "Notisar"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
+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/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "OpenID-adresse"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Fjern OpenID"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Twitter-innstillingar"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "Søk"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Språk er for langt (maksimalt 50 teikn)."
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Endra passordet ditt"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "Lagra passord."
+
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Ikkje ei gyldig epostadresse"
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:91
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "Ukjend profil"
+
+#: actions/profilesettings.php:124
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:144
+#, fuzzy
+msgid "Automatically subscribe to whoever "
+msgstr ""
+"Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
+
+#: actions/profilesettings.php:229 actions/tagother.php:176
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ugyldig heimeside «%s»"
+
+#: actions/profilesettings.php:311
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Kan ikkje lagra profil."
+
+#: actions/public.php:107
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Offentleg tidsline"
+
+#: actions/public.php:173
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "Kan ikkje tinga."
+
+#: actions/public.php:220
+#, 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 "Offentleg straum"
+
+#: actions/publictagcloud.php:63
+#, 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
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, "
+msgstr ""
+"1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
+
+#: 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
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Skriv om deg og interessene dine med 140 teikn"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "Kvar er du, t.d. «Stavanger, Rogaland, Noreg»"
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+msgstr ""
+" unnateke privat data: passord, epostadresse, ljonmeldingsadresse og "
+"telefonnummer."
+
+#: actions/register.php:471
+#, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr ""
+
+#: 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
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Svar til %s"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
+msgstr ""
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
+
+#: actions/showgroup.php:206
+#, fuzzy
+msgid "Group profile"
+msgstr "Denne notisen finst ikkje."
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
+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 "Notisar"
+
+#: actions/showgroup.php:270
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Notisstraum for %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
+msgid "Members"
+msgstr "Medlem sidan"
+
+#: 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/showgroup.php:370
+msgid "All members"
+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 "
+msgstr ""
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
+msgstr ""
+
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid "%s, page %d"
+msgstr "Innboks for %s - side %d"
+
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Profil"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "Denne notisen finst ikkje."
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+#, fuzzy
+msgid "Message"
+msgstr "Ny melding"
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Tingarar"
+
+#: actions/showstream.php:533
+msgid "All groups"
+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 "
+msgstr ""
+
+#: actions/smssettings.php:128
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, "
+msgstr "Telefonnummer, kun tall, med landskode"
+
+#: actions/smssettings.php:162
+#, fuzzy
+msgid "Send me notices through SMS; "
+msgstr "Send meg ein notis via Jabber/GTalk."
+
+#: actions/smssettings.php:335
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. "
+msgstr "Ventar på godkjenning for dette telefonnummeret."
+
+#: actions/smssettings.php:453
+#, fuzzy
+msgid "Mobile carrier"
+msgstr "Velg ein tilbydar"
+
+#: actions/subedit.php:70
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Kan ikkje tinga andre til deg."
+
+#: actions/subedit.php:83
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Kan ikkje sletta tinging."
+
+#: actions/subscribe.php:55
+#, fuzzy
+msgid "Not a local user."
+msgstr "Brukaren finst ikkje."
+
+#: actions/subscribe.php:69
+#, fuzzy
+msgid "Subscribed"
+msgstr "Ting"
+
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Tingarar"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr ""
+
+#: actions/subscribers.php:63
+#, fuzzy
+msgid "These are the people who listen to "
+msgstr "Dette er folk som lyttar til %s's notisar"
+
+#: actions/subscribers.php:67
+#, fuzzy, php-format
+msgid "These are the people who "
+msgstr "Dette er folk som lyttar til %s's notisar"
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Alle tingingar"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Alle tingingar"
+
+#: actions/subscriptions.php:65
+#, fuzzy
+msgid "These are the people whose notices "
+msgstr "Dette er dei du lyttar til."
+
+#: actions/subscriptions.php:69
+#, fuzzy, php-format
+msgid "These are the people whose "
+msgstr "Dette er folk som lyttar til %s's notisar"
+
+#: actions/subscriptions.php:122
+#, fuzzy
+msgid "Jabber"
+msgstr "Nei Jabber-ID"
+
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Notisar merka med %s"
+
+#: actions/tag.php:66
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+msgstr ""
+
+#: actions/tagother.php:33
+#, fuzzy
+msgid "Not logged in"
+msgstr "Ikkje logga inn"
+
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No id argument."
+msgstr "Slikt dokument finst ikkje."
+
+#: actions/tagother.php:65
+#, fuzzy, php-format
+msgid "Tag %s"
+msgstr "Merkelappar"
+
+#: actions/tagother.php:141
+#, fuzzy
+msgid "Tag user"
+msgstr "Merkelappar"
+
+#: 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."
+msgstr ""
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:198
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Kan ikkje lagra brukarbilete-informasjon"
+
+#: actions/tagother.php:233
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "Denne notisen finst ikkje."
+
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Notisar merka med %s"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "Fann ikkje"
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+
+#: actions/twittersettings.php:119
+#, fuzzy
+msgid "Twitter user name"
+msgstr "Brukarnamn på twitter"
+
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Passord på Twitter"
+
+#: actions/twittersettings.php:228
+#, fuzzy
+msgid "Twitter Friends"
+msgstr "Twitter-innstillingar"
+
+#: 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 "Kan ikkje sletta epostgodkjenning."
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Feil ved lagring av brukar"
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Ingen profil-netadresse returnert av tenar."
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Fann ingen status med den ID-en."
+
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Fjern tinging"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
+msgstr ""
+
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Feil ved lagring av brukar"
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Feil ved oppdatering av brukarbilete."
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr ""
+
+#: lib/action.php:130
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "Om"
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "Endra passordet ditt"
+
+#: 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"
+msgstr ""
+
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Opprett ny konto"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "Fann ingen slik OpenID."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Hjelp"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "Ny notis"
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "Ny notis"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Tingingar"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+msgid "All "
+msgstr ""
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Brukaren finst ikkje."
+
+#: lib/blockform.php:153
+msgid "Block"
+msgstr "Blokker"
+
+#: 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 ny konto"
+
+#: 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 "Denne notisen finst ikkje."
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+#, fuzzy
+msgid "Filter tags"
+msgstr "Straum for merkelapp %s"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
+
+#: lib/galleryaction.php:137
+#, fuzzy
+msgid "Tag"
+msgstr "Merkelappar"
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+msgid "URL of the homepage or blog of the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Tingingar"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Skriv om deg og interessene dine med 140 teikn"
+
+#: lib/groupeditform.php:158
+#, fuzzy
+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
+msgid "Group"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Logg ut"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+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
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Heimesida er ikkje ei gyldig internettadresse."
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Logg inn"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Lagra"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Ugyldig brukarnamn eller passord."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Opprett ny konto"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s høyrer no på notisane dine på %2$s."
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Stad: %s"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Heimeside: %s"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
+
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s høyrer no på notisane dine på %2$s."
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+#, fuzzy
+msgid "From"
+msgstr " frå "
+
+#: lib/messageform.php:110
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Slett notis"
+
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "Send ei melding"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 eller fleire teikn"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "som svar på..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Kan ikkje sletta notisen."
+
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "svar"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Slett notis"
+
+#: lib/noticelist.php:474
+#, fuzzy
+msgid "Delete"
+msgstr "slett"
+
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
+msgstr ""
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr ""
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "Send ei melding"
+
+#: lib/personaltagcloudsection.php:56
+#, fuzzy, php-format
+msgid "Tags in %s's notices"
+msgstr "Brukaren har ikkje siste notis"
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr ""
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr ""
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#, fuzzy
+msgid "Recent tags"
+msgstr "Nylege merkelappar"
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "Folk"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Notisar"
+
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "Finn folk på denne sida"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Eksternt abbonement"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Tingar %s"
+
+#: lib/subgroupnav.php:97
+#, 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 ""
+
+#: lib/subs.php:53
+msgid "User has blocked you."
+msgstr "Brukar har blokkert deg."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Tingar %s"
+
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+msgstr "Nei"
+
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr ""
+
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "Brukaren finst ikkje."
+
+#: lib/unblockform.php:150
+msgid "Unblock"
+msgstr "LÃ¥s opp"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+#, fuzzy
+msgid "Unsubscribe from this user"
+msgstr "Tingar ikkje %s lengre"
+
+#, fuzzy
+#~ msgid "Code not yet ready."
+#~ msgstr "Kunne ikkje prosessera melding."
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "Opprett ny konto"
+
+#, fuzzy
+#~ msgid "Check if you are sure you want to delete your account."
+#~ msgstr "Sikker på at du vil sletta notisen?"
+
+#, fuzzy
+#~ msgid "Showing recently popular notices"
+#~ msgstr "Søk i innhaldet av notisar"
diff --git a/locale/no_NB/LC_MESSAGES/laconica.mo b/locale/no_NB/LC_MESSAGES/laconica.mo
deleted file mode 100644
index f7886ee2a..000000000
--- a/locale/no_NB/LC_MESSAGES/laconica.mo
+++ /dev/null
diff --git a/locale/no_NB/LC_MESSAGES/laconica.po b/locale/no_NB/LC_MESSAGES/laconica.po
deleted file mode 100644
index 8bdc44b68..000000000
--- a/locale/no_NB/LC_MESSAGES/laconica.po
+++ /dev/null
@@ -1,2914 +0,0 @@
-# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"#-#-#-#-#  laconica.po  #-#-#-#-#\n"
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-29 20:02+1200\n"
-"PO-Revision-Date: 2008-08-01 17:38+0100\n"
-"Last-Translator: forteller <forteller@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Norwegian Bokmal\n"
-"X-Poedit-Country: NORWAY\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr ""
-
-#: ../actions/tag.php:139
-msgid " by "
-msgstr "av"
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:255
-#: ../actions/register.php:191 actions/finishopenidlogin.php:88
-#: actions/register.php:205
-msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:469 ../actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/tag.php:127
-#, php-format
-msgid "%1$s Notices recently tagged with %2$s"
-msgstr ""
-
-#: ../lib/mail.php:120 ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
-
-#: ../lib/mail.php:122 ../lib/mail.php:126
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:473 ../actions/twitapistatuses.php:482
-#: actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr ""
-
-#: ../actions/publicrss.php:60 ../actions/publicrss.php:62
-#: actions/publicrss.php:48
-#, php-format
-msgid "%s Public Stream"
-msgstr ""
-
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:235 ../lib/stream.php:51
-#, php-format
-msgid "%s and friends"
-msgstr "%s og venner"
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:202 ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:335 ../actions/twitapistatuses.php:338
-#: actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:277 ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../lib/util.php:244 ../lib/util.php:257 lib/util.php:273
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
-msgstr ""
-
-#: ../lib/util.php:246 ../lib/util.php:259 lib/util.php:275
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr ""
-
-#: ../lib/util.php:261 ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: ../actions/register.php:221 ../actions/register.php:152
-#: actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/password.php:42
-msgid "6 or more characters"
-msgstr "6 eller flere tegn"
-
-#: ../actions/recoverpassword.php:165 ../actions/recoverpassword.php:180
-#: actions/recoverpassword.php:186
-msgid "6 or more characters, and don't forget it!"
-msgstr ""
-
-#: ../actions/register.php:223 ../actions/register.php:154
-#: actions/register.php:168
-msgid "6 or more characters. Required."
-msgstr ""
-
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
-msgstr ""
-
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-msgstr ""
-
-#: ../lib/util.php:310
-msgid "About"
-msgstr "Om"
-
-#: ../actions/userauthorization.php:119
-msgid "Accept"
-msgstr "Aksepter"
-
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
-msgid "Add"
-msgstr "Legg til"
-
-#: ../actions/openidsettings.php:43
-msgid "Add OpenID"
-msgstr "Legg til OpenID"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
-msgid "Address"
-msgstr "Adresse"
-
-#: ../actions/showstream.php:273
-msgid "All subscriptions"
-msgstr "Alle abonnementer"
-
-#: ../actions/publicrss.php:62
-#, php-format
-msgid "All updates for %s"
-msgstr "Alle oppdateringer for %s"
-
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#, php-format
-msgid "All updates matching search term \"%s\""
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
-msgid "Already logged in."
-msgstr "Allerede logget inn."
-
-#: ../actions/subscribe.php:49 ../lib/subs.php:42 lib/subs.php:42
-msgid "Already subscribed!."
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
-msgid "Authorize subscription"
-msgstr "Autoriser abonnementet"
-
-#: ../actions/login.php:104 ../actions/register.php:242
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med "
-"andre!"
-
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr "Abonner "
-
-#: ../actions/avatar.php:32
-msgid "Avatar"
-msgstr "Avatar"
-
-#: ../actions/avatar.php:113
-msgid "Avatar updated."
-msgstr "Avataren har blitt oppdatert."
-
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
-#, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
-msgstr ""
-
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr "Venter på bekreftelse på dette telefonnummeret"
-
-#: ../lib/util.php:1290
-msgid "Before »"
-msgstr "Tidligere »"
-
-#: ../actions/profilesettings.php:49 ../actions/register.php:234
-msgid "Bio"
-msgstr "Bio"
-
-#: ../actions/profilesettings.php:101 ../actions/register.php:78
-#: ../actions/updateprofile.php:103
-msgid "Bio is too long (max 140 chars)."
-msgstr "Bioen er for lang (max 140 tegn)"
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr ""
-
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
-msgid "Can't save new password."
-msgstr "Klarer ikke å lagre det nye passordet"
-
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../lib/openid.php:121 lib/openid.php:121
-msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
-
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-msgid "Cannot normalize that Jabber ID"
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../actions/password.php:45
-msgid "Change"
-msgstr "Endre"
-
-#: ../actions/password.php:32
-msgid "Change password"
-msgstr "Endre passord"
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:224 ../actions/smssettings.php:65
-msgid "Confirm"
-msgstr "Bekreft"
-
-#: ../actions/confirmaddress.php:86
-msgid "Confirm Address"
-msgstr "Bekreft Adresse"
-
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
-msgid "Confirmation cancelled."
-msgstr "Bekreftelse avbrutt."
-
-#: ../actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr "Bekreftelseskode"
-
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-msgid "Confirmation code not found."
-msgstr ""
-
-#: ../actions/register.php:266 ../actions/register.php:202
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:91
-msgid "Connect"
-msgstr "Koble til"
-
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-msgid "Connect existing account"
-msgstr ""
-
-#: ../lib/util.php:318
-msgid "Contact"
-msgstr "Kontakt"
-
-#: ../lib/openid.php:178 lib/openid.php:178
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:48 ../actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/openid.php:160 lib/openid.php:160
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr ""
-
-#: ../actions/updateprofile.php:162
-msgid "Could not save avatar info"
-msgstr "Klarte ikke å lagre avatar-informasjonen"
-
-#: ../actions/updateprofile.php:155
-msgid "Could not save new profile info"
-msgstr "Klarte ikke å lagre den nye profil-informasjonen"
-
-#: ../actions/subscribe.php:62 ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../actions/subscribe.php:54 ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
-msgid "Couldn't convert request tokens to access tokens."
-msgstr ""
-
-#: ../actions/confirmaddress.php:80 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
-#: ../actions/confirmaddress.php:84 actions/confirmaddress.php:84
-#: actions/emailsettings.php:252 actions/imsettings.php:226
-#: actions/smssettings.php:249
-msgid "Couldn't delete email confirmation."
-msgstr ""
-
-#: ../actions/unsubscribe.php:57 ../lib/subs.php:103 lib/subs.php:116
-msgid "Couldn't delete subscription."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
-msgid "Couldn't get a request token."
-msgstr ""
-
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-msgid "Couldn't insert confirmation code."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
-msgid "Couldn't insert new subscription."
-msgstr ""
-
-#: ../actions/profilesettings.php:181 ../actions/twitapiaccount.php:92
-msgid "Couldn't save profile."
-msgstr "Klarte ikke å lagre profil."
-
-#: ../actions/profilesettings.php:158 ../actions/profilesettings.php:161
-#: actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
-msgid "Couldn't update user."
-msgstr "Klarte ikke å oppdatere bruker."
-
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-msgid "Create"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:70
-msgid "Create a new user with this nickname."
-msgstr "Lag en ny bruker med dette nicket."
-
-#: ../actions/finishopenidlogin.php:68
-msgid "Create new account"
-msgstr "Opprett en ny konto"
-
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-msgid "Creating new account for OpenID that already has a user."
-msgstr ""
-
-#: ../actions/imsettings.php:45
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Nåværende bekreftede Jabber/GTak-adresse."
-
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Nåværende bekreftede telefonnummer med mulighet for å motta SMS."
-
-#: ../actions/emailsettings.php:44
-msgid "Current confirmed email address."
-msgstr "Nåværende bekreftede e-postadresse"
-
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../lib/util.php:1033 ../lib/util.php:1061 lib/util.php:1110
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:236
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Beskriv degselv og dine interesser med 140 tegn"
-
-#: ../actions/register.php:226
-msgid "Email"
-msgstr "E-post"
-
-#: ../actions/emailsettings.php:59
-msgid "Email Address"
-msgstr "E-postadresse"
-
-#: ../actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr "Innstillinger for e-post"
-
-#: ../actions/register.php:69 ../actions/register.php:73
-#: actions/register.php:80
-msgid "Email address already exists."
-msgstr ""
-
-#: ../lib/mail.php:90 lib/mail.php:90
-msgid "Email address confirmation"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
-#: actions/recoverpassword.php:197
-msgid "Enter a nickname or email address."
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-msgid "Error authorizing token"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:282 ../actions/finishopenidlogin.php:253
-#: actions/finishopenidlogin.php:259
-msgid "Error connecting user to OpenID."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-msgid "Error connecting user."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
-msgid "Error inserting avatar"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
-msgid "Error inserting new profile"
-msgstr ""
-
-#: ../actions/postnotice.php:89
-msgid "Error inserting notice"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
-msgid "Error inserting remote profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:201 ../actions/recoverpassword.php:240
-#: actions/recoverpassword.php:246
-msgid "Error saving address confirmation."
-msgstr ""
-
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-msgid "Error saving remote profile"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
-#: lib/openid.php:226
-msgid "Error saving the profile."
-msgstr ""
-
-#: ../lib/openid.php:237 lib/openid.php:237
-msgid "Error saving the user."
-msgstr ""
-
-#: ../actions/password.php:80 actions/profilesettings.php:399
-msgid "Error saving user; invalid."
-msgstr ""
-
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:268 ../actions/register.php:92
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108
-msgid "Error setting user."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-msgid "Error updating profile"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
-msgid "Error updating remote profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:79 ../actions/recoverpassword.php:80
-#: actions/recoverpassword.php:80
-msgid "Error with confirmation code."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:89
-msgid "Existing nickname"
-msgstr "Eksisterende nick"
-
-#: ../lib/util.php:312
-msgid "FAQ"
-msgstr "OSS/FAQ"
-
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-msgid "Failed updating avatar."
-msgstr ""
-
-#: ../actions/all.php:61 ../actions/allrss.php:64
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "Feed for %s sine venner"
-
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Feed for svar til %s"
-
-#: ../actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Feed for taggen %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-
-#: ../actions/profilesettings.php:44 ../actions/register.php:228
-msgid "Full name"
-msgstr "Fullt navn"
-
-#: ../actions/profilesettings.php:98 ../actions/register.php:75
-#: ../actions/updateprofile.php:93
-msgid "Full name is too long (max 255 chars)."
-msgstr "Beklager, navnet er for langt (max 250 tegn)."
-
-#: ../lib/util.php:291
-msgid "Help"
-msgstr "Hjelp"
-
-#: ../lib/util.php:285
-msgid "Home"
-msgstr "Hjem"
-
-#: ../actions/profilesettings.php:46 ../actions/register.php:231
-msgid "Homepage"
-msgstr "Hjemmesiden"
-
-#: ../actions/profilesettings.php:95 ../actions/register.php:72
-#: ../actions/register.php:76 actions/profilesettings.php:210
-#: actions/register.php:83
-msgid "Homepage is not a valid URL."
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../actions/imsettings.php:60
-msgid "IM Address"
-msgstr "IM-adresse"
-
-#: ../actions/imsettings.php:33
-msgid "IM Settings"
-msgstr "Innstillinger for IM"
-
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr ""
-
-#: ../actions/openidsettings.php:45
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-
-#: ../actions/recoverpassword.php:122
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr "innkommende e-post"
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/password.php:69
-msgid "Incorrect old password"
-msgstr "Feil gammelt passord"
-
-#: ../actions/login.php:67
-msgid "Incorrect username or password."
-msgstr "Feil brukernavn eller passord"
-
-#: ../actions/recoverpassword.php:226
-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/updateprofile.php:114
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Ugyldig avatar-URL '%s'"
-
-#: ../actions/updateprofile.php:98
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Ugyldig hjemmeside '%s'"
-
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr ""
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-msgid "Invalid notice content"
-msgstr ""
-
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-msgid "Invalid notice uri"
-msgstr ""
-
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-msgid "Invalid notice url"
-msgstr ""
-
-#: ../actions/updateprofile.php:87
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Ugyldig profil-URL '%s'"
-
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-msgid "Invalid profile URL (bad format)"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
-msgid "Invalid profile URL returned by server."
-msgstr ""
-
-#: ../actions/avatarbynickname.php:37
-msgid "Invalid size."
-msgstr "Ugyldig størrelse"
-
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:87
-#: ../actions/register.php:103
-msgid "Invalid username or password."
-msgstr "Ugyldig brukernavn eller passord"
-
-#: ../lib/util.php:248 ../lib/util.php:261 lib/util.php:277
-#, php-format
-msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-msgid "Jabber ID already belongs to another user."
-msgstr ""
-
-#: ../actions/imsettings.php:62 actions/imsettings.php:63
-#, php-format
-msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
-msgstr ""
-
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr "Språk"
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/tag.php:133
-msgid "Last message posted: "
-msgstr ""
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:237
-#: ../actions/register.php:173 actions/profilesettings.php:85
-#: actions/register.php:187
-msgid "Location"
-msgstr ""
-
-#: ../actions/profilesettings.php:104 ../actions/register.php:81
-#: ../actions/updateprofile.php:108 ../actions/register.php:85
-#: actions/profilesettings.php:219 actions/register.php:92
-#: actions/updateprofile.php:109
-msgid "Location is too long (max 255 chars)."
-msgstr ""
-
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:298
-msgid "Login"
-msgstr "Logg inn"
-
-#: ../actions/openidlogin.php:44
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Logg inn med en [OpenID](%%doc.openid%%)-konto."
-
-#: ../actions/login.php:126
-#, php-format
-msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
-msgstr ""
-
-#: ../lib/util.php:296
-msgid "Logout"
-msgstr "Logg ut"
-
-#: ../actions/register.php:230
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Lengre navn, helst ditt \"ekte\" navn"
-
-#: ../actions/login.php:110
-msgid "Lost or forgotten password?"
-msgstr "Mistet eller glemt passordet?"
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
-msgid "Member since"
-msgstr "Medlem siden"
-
-#: ../actions/userrss.php:70
-#, php-format
-msgid "Microblog by %s"
-msgstr "Mikroblogg av %s"
-
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:252
-#: ../actions/register.php:188 actions/finishopenidlogin.php:85
-#: actions/register.php:202
-msgid "My text and files are available under "
-msgstr ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr "Ny"
-
-#: ../lib/mail.php:140 ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:71
-msgid "New nickname"
-msgstr "Nytt nick"
-
-#: ../actions/newnotice.php:102 ../actions/newnotice.php:87
-#: actions/newnotice.php:96
-msgid "New notice"
-msgstr ""
-
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
-msgid "New password"
-msgstr "Nytt passord"
-
-#: ../actions/recoverpassword.php:275 ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr ""
-
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:220
-msgid "Nickname"
-msgstr "Nick"
-
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:65
-msgid "Nickname already in use. Try another one."
-msgstr "Det nicket er allerede i bruk. Prøv et annet."
-
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:63 ../actions/updateprofile.php:77
-#: ../actions/register.php:67 actions/finishopenidlogin.php:171
-#: actions/profilesettings.php:203 actions/register.php:74
-#: actions/updateprofile.php:78
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:170
-msgid "Nickname not allowed."
-msgstr "Dette nicket er ikke tillatt"
-
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-msgid "Nickname of the user you want to follow"
-msgstr ""
-
-#: ../actions/recoverpassword.php:147
-msgid "Nickname or email"
-msgstr "Nick eller e-postadresse"
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
-msgid "No Jabber ID."
-msgstr "Ingen Jabber ID."
-
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-msgid "No authorization request!"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-msgid "No confirmation code."
-msgstr ""
-
-#: ../actions/newnotice.php:50 ../actions/newnotice.php:44
-#: actions/newmessage.php:53 actions/newnotice.php:44 classes/Command.php:197
-msgid "No content!"
-msgstr ""
-
-#: ../actions/emailsettings.php:174
-msgid "No email address."
-msgstr "Ingen e-postadresse."
-
-#: ../actions/userbyid.php:32
-msgid "No id."
-msgstr "Ingen id."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
-msgid "No nickname provided by remote server."
-msgstr ""
-
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-msgid "No nickname."
-msgstr ""
-
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-msgid "No pending confirmation to cancel."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
-msgid "No profile URL returned by server."
-msgstr ""
-
-#: ../actions/recoverpassword.php:189 ../actions/recoverpassword.php:226
-#: actions/recoverpassword.php:232
-msgid "No registered email address for that user."
-msgstr ""
-
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-msgid "No request found!"
-msgstr ""
-
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-msgid "No results"
-msgstr ""
-
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-msgid "No size."
-msgstr ""
-
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-msgid "No such OpenID."
-msgstr ""
-
-#: ../actions/doc.php:29 actions/doc.php:29
-msgid "No such document."
-msgstr ""
-
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30
-msgid "No such notice."
-msgstr ""
-
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-msgid "No such recovery code."
-msgstr ""
-
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-msgid "No such subscription"
-msgstr ""
-
-#: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/replies.php:57
-#: ../actions/repliesrss.php:35 ../actions/showstream.php:110
-#: ../actions/subscribe.php:44 ../actions/unsubscribe.php:39
-#: ../actions/userbyid.php:36 ../actions/userrss.php:35 ../actions/xrds.php:35
-#: ../lib/gallery.php:57 ../lib/subs.php:33 ../lib/subs.php:82
-#: actions/all.php:34 actions/allrss.php:35 actions/avatarbynickname.php:43
-#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
-#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
-#: actions/replies.php:57 actions/repliesrss.php:35
-#: actions/showfavorites.php:34 actions/showstream.php:110
-#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
-#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
-#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
-#: lib/subs.php:33 lib/subs.php:95
-msgid "No such user."
-msgstr ""
-
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-msgid "Not a recovery code."
-msgstr ""
-
-#: ../actions/imsettings.php:167
-msgid "Not a valid Jabber ID"
-msgstr "Ugyldig Jabber ID"
-
-#: ../lib/openid.php:131
-msgid "Not a valid OpenID."
-msgstr "Ugyldig OpenID"
-
-#: ../actions/emailsettings.php:185
-msgid "Not a valid email address"
-msgstr "Ugyldig e-postadresse"
-
-#: ../actions/register.php:59
-msgid "Not a valid email address."
-msgstr "Ugyldig e-postadresse."
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:67
-msgid "Not a valid nickname."
-msgstr "Ugyldig nick."
-
-#: ../actions/remotesubscribe.php:118 ../actions/remotesubscribe.php:120
-#: actions/remotesubscribe.php:129
-msgid "Not a valid profile URL (incorrect services)."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:111 ../actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:122
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr ""
-
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-msgid "Not an image or corrupt file."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:51
-msgid "Not authorized."
-msgstr "Ikke autorisert."
-
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
-msgid "Not expecting this response!"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
-msgid "Not logged in."
-msgstr "Ikke logget inn."
-
-#: ../actions/unsubscribe.php:44 ../lib/subs.php:91 lib/subs.php:104
-msgid "Not subscribed!."
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#, php-format
-msgid "Notice feed for %s"
-msgstr ""
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-msgid "Notice has no profile"
-msgstr ""
-
-#: ../actions/showstream.php:316 actions/showstream.php:331
-msgid "Notices"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 ../actions/tag.php:124
-#: actions/tag.php:35 actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/password.php:39
-msgid "Old password"
-msgstr "Gammelt passord"
-
-#: ../lib/util.php:302
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-msgid "OpenID Account Setup"
-msgstr ""
-
-#: ../lib/openid.php:180 lib/openid.php:180
-msgid "OpenID Auto-Submit"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-msgid "OpenID Login"
-msgstr ""
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-msgid "OpenID URL"
-msgstr "OpenID-URL"
-#-#-#-#-
-#  laconica.po#-#-#-#-
-#  eller autentifikasjon?
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#, fuzzy
-msgid "OpenID authentication cancelled."
-msgstr ""
-"#-#-#-#-#  laconica.po  #-#-#-#-#\n"
-"OpenID-autentifisering avbrutt.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr ""
-
-#: ../lib/openid.php:133 lib/openid.php:133
-#, php-format
-msgid "OpenID failure: %s"
-msgstr ""
-
-#: ../actions/openidsettings.php:144
-msgid "OpenID removed."
-msgstr "OpenID fjernet"
-
-#: ../actions/openidsettings.php:37
-msgid "OpenID settings"
-msgstr "Innstillinger for OpenID"
-
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-msgid "Partial upload."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:222
-msgid "Password"
-msgstr "Passord"
-
-#: ../actions/recoverpassword.php:249 ../actions/recoverpassword.php:288
-#: actions/recoverpassword.php:301
-msgid "Password and confirmation do not match."
-msgstr ""
-
-#: ../actions/recoverpassword.php:245
-msgid "Password must be 6 chars or more."
-msgstr "Passordet må bestå av 6 eller flere tegn."
-
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-msgid "Password recovery requested"
-msgstr ""
-
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
-msgid "Password saved."
-msgstr "Passordet ble lagret"
-
-#: ../actions/password.php:61 ../actions/register.php:84
-#: ../actions/register.php:88 actions/profilesettings.php:380
-#: actions/register.php:98
-msgid "Passwords don't match."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-msgid "People search"
-msgstr ""
-
-#: ../lib/stream.php:50
-msgid "Personal"
-msgstr "Personlig"
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/userauthorization.php:78
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user's notices. If you didn't just ask to subscribe to someone's notices, "
-"click \"Cancel\"."
-msgstr ""
-
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
-
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70
-msgid "Preferences"
-msgstr ""
-
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-msgid "Preferences saved."
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../lib/util.php:314 ../lib/util.php:328 lib/util.php:344
-msgid "Privacy"
-msgstr ""
-
-#: ../actions/newnotice.php:62 ../actions/newnotice.php:70
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119
-msgid "Problem saving notice."
-msgstr ""
-
-#: ../lib/stream.php:60
-msgid "Profile"
-msgstr "Profil"
-
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-msgid "Profile URL"
-msgstr ""
-
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-msgid "Profile settings"
-msgstr ""
-
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-msgid "Profile unknown"
-msgstr ""
-
-#: ../lib/util.php:287
-#, fuzzy
-msgid "Public"
-msgstr "Offentlig"
-
-#: ../actions/public.php:54 actions/public.php:54
-msgid "Public Stream Feed"
-msgstr ""
-
-#: ../actions/public.php:33 actions/public.php:33
-msgid "Public timeline"
-msgstr ""
-
-#: ../actions/imsettings.php:79
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
-
-#: ../actions/emailsettings.php:94
-msgid "Publish a MicroID for my email address."
-msgstr "Publiser en MicroID for min e-postadresse."
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Nyeste Tagger"
-
-#: ../actions/recoverpassword.php:151
-msgid "Recover"
-msgstr "Gjenopprett"
-
-#: ../actions/recoverpassword.php:141 ../actions/recoverpassword.php:156
-#: actions/recoverpassword.php:161
-msgid "Recover password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-msgid "Recovery code for unknown user."
-msgstr ""
-
-#: ../actions/register.php:216 ../actions/register.php:257 ../lib/util.php:300
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-msgid "Register"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:264 ../actions/register.php:200
-#: actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-msgid "Reject"
-msgstr ""
-
-#: ../actions/login.php:103 ../actions/register.php:240
-msgid "Remember me"
-msgstr "Husk meg"
-
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-msgid "Remote profile with no matching profile"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-msgid "Remote subscribe"
-msgstr ""
-
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
-#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
-msgid "Remove"
-msgstr "Fjern"
-
-#: ../actions/openidsettings.php:68
-msgid "Remove OpenID"
-msgstr "Fjern OpenID"
-
-#: ../actions/openidsettings.php:73
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-
-#: ../lib/stream.php:55
-msgid "Replies"
-msgstr "Svar"
-
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#, php-format
-msgid "Replies to %s"
-msgstr "Svar til %s"
-
-#: ../actions/recoverpassword.php:168
-msgid "Reset"
-msgstr "Nullstill"
-
-#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
-msgid "Reset password"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr "Telefonnummer for SMS"
-
-#: ../actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr "Innstillinger for SMS"
-
-#: ../lib/mail.php:215 ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/recoverpassword.php:167 ../actions/recoverpassword.php:182
-#: actions/recoverpassword.php:188
-msgid "Same as password above"
-msgstr ""
-
-#: ../actions/register.php:225 ../actions/register.php:156
-#: actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
-msgid "Save"
-msgstr "Lagre"
-
-#: ../lib/searchaction.php:84 ../lib/util.php:288
-msgid "Search"
-msgstr "Søk"
-
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-msgid "Search Stream Feed"
-msgstr ""
-
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#, php-format
-msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
-msgstr ""
-
-#: ../actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-"Separate the terms by spaces; they must be 3 characters or more."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-msgstr ""
-
-#: ../lib/util.php:1144
-msgid "Send"
-msgstr "Send"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-msgid "Send me notices through Jabber/GTalk."
-msgstr ""
-
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
-
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-
-#: ../lib/util.php:294 ../lib/util.php:304 lib/util.php:320
-msgid "Settings"
-msgstr ""
-
-#: ../actions/profilesettings.php:189 ../actions/profilesettings.php:192
-#: actions/profilesettings.php:307
-msgid "Settings saved."
-msgstr ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-msgid "Someone else already has this OpenID."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-msgid "Something weird happened."
-msgstr ""
-
-#: ../lib/util.php:316
-msgid "Source"
-msgstr "Kilde"
-
-#: ../actions/showstream.php:296
-msgid "Statistics"
-msgstr "Statistikk"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
-#: ../actions/finishopenidlogin.php:246 actions/finishopenidlogin.php:188
-#: actions/finishopenidlogin.php:252
-msgid "Stored OpenID not found."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-msgid "Subscribe"
-msgstr ""
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-msgid "Subscribers"
-msgstr ""
-
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-msgid "Subscription authorized"
-msgstr ""
-
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-msgid "Subscription rejected"
-msgstr ""
-
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-msgid "Subscriptions"
-msgstr ""
-
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-msgid "System error uploading file."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:289
-msgid "Tags"
-msgstr "Tagger"
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr "Tekst"
-
-#: ../actions/noticesearch.php:34
-msgid "Text search"
-msgstr "Tekst-søk"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-msgid "That OpenID does not belong to you."
-msgstr ""
-
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-msgid "That address has already been confirmed."
-msgstr ""
-
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-msgid "That confirmation code is not for you!"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/avatar.php:80
-msgid "That file is too big."
-msgstr "Den filen er for stor."
-
-#: ../actions/imsettings.php:170
-msgid "That is already your Jabber ID."
-msgstr "Det er allerede din Jabber ID."
-
-#: ../actions/emailsettings.php:188
-msgid "That is already your email address."
-msgstr "Det er allerede din e-postadresse."
-
-#: ../actions/smssettings.php:188
-msgid "That is already your phone number."
-msgstr "Det er allerede din ditt telefonnummer."
-
-#: ../actions/imsettings.php:233
-msgid "That is not your Jabber ID."
-msgstr "Det er ikke din Jabber ID."
-
-#: ../actions/emailsettings.php:249
-msgid "That is not your email address."
-msgstr "Det er ikke din e-postadresse."
-
-#: ../actions/smssettings.php:257
-msgid "That is not your phone number."
-msgstr "Det er ikke ditt telefonnummer."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-msgid "That is the wrong IM address."
-msgstr "Det er feil IM-adresse."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/newnotice.php:53 ../actions/newnotice.php:49
-#: ../actions/twitapistatuses.php:408 actions/newnotice.php:49
-#: actions/twitapistatuses.php:330
-msgid "That's too long. Max notice size is 140 chars."
-msgstr ""
-
-#: ../actions/confirmaddress.php:88 ../actions/confirmaddress.php:92
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-msgid "The address was removed."
-msgstr ""
-
-#: ../actions/userauthorization.php:312
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-
-#: ../actions/userauthorization.php:322
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr ""
-
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr ""
-
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr ""
-
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr ""
-
-#: ../actions/recoverpassword.php:87 ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr ""
-
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your OpenID "
-"to a local account. You can either create a new account, or connect with "
-"your existing account, if you have one."
-msgstr ""
-
-#: ../lib/util.php:151 ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr ""
-
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr "Tidssone"
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:43
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:150 ../actions/twitapifriendships.php:163
-#: actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:233
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-msgid "URL of your profile on another compatible microblogging service"
-msgstr ""
-
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
-#: actions/emailsettings.php:144 actions/imsettings.php:118
-#: actions/recoverpassword.php:39 actions/smssettings.php:143
-#: actions/twittersettings.php:108
-msgid "Unexpected form submission."
-msgstr ""
-
-#: ../actions/recoverpassword.php:237 ../actions/recoverpassword.php:276
-#: actions/recoverpassword.php:289
-msgid "Unexpected password reset."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
-msgid "Unknown version of OMB protocol."
-msgstr ""
-
-#: ../lib/util.php:256 ../lib/util.php:269 lib/util.php:285
-msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
-msgstr ""
-
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr ""
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-msgid "Unsubscribe"
-msgstr ""
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-msgid "Unsupported OMB version"
-msgstr ""
-
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-msgid "Unsupported image file format."
-msgstr ""
-
-#: ../lib/twitterapi.php:257 ../lib/twitterapi.php:278
-msgid "Unsupported type"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:238 ../actions/twitapistatuses.php:241
-#: actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 ../actions/twitapistatuses.php:341
-#: actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../actions/avatar.php:68
-msgid "Upload"
-msgstr "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."
-msgstr ""
-
-#: ../actions/register.php:227 ../actions/register.php:159
-#: ../actions/register.php:162 actions/register.php:173
-#: actions/register.php:176
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88
-msgid "User being listened to doesn't exist."
-msgstr ""
-
-#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:78
-#: ../actions/twitapistatuses.php:316 ../actions/twitapistatuses.php:621
-#: ../actions/twitapiaccount.php:82 ../actions/twitapistatuses.php:319
-#: ../actions/twitapistatuses.php:685 ../actions/twitapiusers.php:82
-#: actions/all.php:41 actions/avatarbynickname.php:48 actions/foaf.php:47
-#: actions/replies.php:41 actions/showfavorites.php:41
-#: actions/showstream.php:44 actions/twitapiaccount.php:80
-#: actions/twitapifavorites.php:68 actions/twitapistatuses.php:235
-#: actions/twitapistatuses.php:609 actions/twitapiusers.php:87
-#: lib/mailbox.php:50
-msgid "User has no profile."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-msgid "User nickname"
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1131 ../lib/util.php:1159 lib/util.php:1293
-#, php-format
-msgid "What's up, %s?"
-msgstr ""
-
-#: ../actions/profilesettings.php:54 ../actions/register.php:239
-#: ../actions/register.php:175 actions/profilesettings.php:87
-#: actions/register.php:189
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
-
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr "Ja"
-
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-msgid "You already have this OpenID!"
-msgstr ""
-
-#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
-#: ../actions/recoverpassword.php:31
-msgid "You are already logged in!"
-msgstr "Du er allerede logget inn!"
-
-#: ../actions/twitapifriendships.php:115 ../actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr ""
-
-#: ../actions/register.php:209 ../actions/register.php:135
-#: actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
-msgstr ""
-
-#: ../actions/profilesettings.php:27
-msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-msgid "You can use the local subscription!"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:57
-#: ../actions/register.php:61 actions/finishopenidlogin.php:38
-#: actions/register.php:68
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-msgid "You did not send us that profile"
-msgstr ""
-
-#: ../lib/mail.php:143 ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/recoverpassword.php:134 ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr ""
-
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-msgid "Your OpenID URL"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr ""
-
-#: ../actions/openidsettings.php:28
-#, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
-msgstr ""
-
-#: ../lib/util.php:919
-msgid "a few seconds ago"
-msgstr "noen få sekunder siden"
-
-#: ../lib/util.php:931
-#, php-format
-msgid "about %d days ago"
-msgstr "omtrent %d dager siden"
-
-#: ../lib/util.php:927
-#, php-format
-msgid "about %d hours ago"
-msgstr "omtrent %d timer siden"
-
-#: ../lib/util.php:923
-#, php-format
-msgid "about %d minutes ago"
-msgstr "omtrent %d minutter siden"
-
-#: ../lib/util.php:935
-#, php-format
-msgid "about %d months ago"
-msgstr "omtrent %d måneder siden"
-
-#: ../lib/util.php:929
-msgid "about a day ago"
-msgstr "omtrent én dag siden"
-
-#: ../lib/util.php:921
-msgid "about a minute ago"
-msgstr "omtrent ett minutt siden"
-
-#: ../lib/util.php:933
-msgid "about a month ago"
-msgstr "omtrent én måned siden"
-
-#: ../lib/util.php:937
-msgid "about a year ago"
-msgstr "omtrent ett år siden"
-
-#: ../lib/util.php:925
-msgid "about an hour ago"
-msgstr "omtrent én time siden"
-
-#: ../actions/showstream.php:424 ../lib/stream.php:130
-msgid "delete"
-msgstr "slett"
-
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:408
-#: ../lib/stream.php:114 ../actions/noticesearch.php:130 ../lib/stream.php:117
-#: actions/noticesearch.php:136 actions/showstream.php:426 lib/stream.php:84
-msgid "in reply to..."
-msgstr ""
-
-#: ../lib/twitterapi.php:363
-msgid "not a supported data format"
-msgstr ""
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:415
-#: ../lib/stream.php:121
-msgid "reply"
-msgstr "svar"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-msgid "same as password above"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:691 ../actions/twitapistatuses.php:755
-#: actions/twitapistatuses.php:678
-msgid "unsupported file type"
-msgstr ""
-
-#: ../lib/util.php:1281 ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr ""
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr ""
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
-msgstr ""
-
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
-msgstr ""
-
-#: actions/disfavor.php:72
-msgid "Favor"
-msgstr ""
-
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
-
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
-msgstr ""
-
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
-msgstr ""
-
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr ""
-
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#, php-format
-msgid "%s favorite notices"
-msgstr ""
-
-#: actions/favoritesrss.php:64
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr ""
-
-#: actions/inbox.php:28
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr ""
-
-#: actions/inbox.php:30
-#, php-format
-msgid "Inbox for %s"
-msgstr ""
-
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
-
-#: actions/invite.php:178
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-msgstr ""
-
-#: actions/login.php:104
-msgid "Automatically login in the future; "
-msgstr ""
-
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
-msgstr ""
-
-#: actions/login.php:126
-msgid "Login with your username and password. "
-msgstr ""
-
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
-msgstr ""
-
-#: actions/newmessage.php:65
-msgid "No recipient specified."
-msgstr ""
-
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
-msgstr ""
-
-#: actions/newmessage.php:108
-msgid "No such user"
-msgstr ""
-
-#: actions/newmessage.php:117
-msgid "New message"
-msgstr ""
-
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
-msgstr ""
-
-#: actions/openidsettings.php:28
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
-
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
-msgstr ""
-
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
-
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
-msgstr ""
-
-#: actions/outbox.php:28
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr ""
-
-#: actions/outbox.php:30
-#, php-format
-msgid "Outbox for %s"
-msgstr ""
-
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
-
-#: actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr ""
-
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
-msgstr ""
-
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
-msgstr ""
-
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
-msgstr ""
-
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
-msgstr ""
-
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
-msgstr ""
-
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
-msgstr ""
-
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
-msgstr ""
-
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
-msgstr ""
-
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
-msgstr ""
-
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr ""
-
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr ""
-
-#: actions/remotesubscribe.php:51
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
-
-#: actions/showfavorites.php:61
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr ""
-
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
-msgstr ""
-
-#: actions/showmessage.php:33
-msgid "No such message."
-msgstr ""
-
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr ""
-
-#: actions/showmessage.php:61
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
-
-#: actions/showmessage.php:66
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr ""
-
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr ""
-
-#: actions/smssettings.php:312
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr ""
-
-#: actions/twitapidirect_messages.php:76
-#, php-format
-msgid "Direct messages to %s"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:77
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:82
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
-msgstr ""
-
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
-#: actions/twitapifavorites.php:92
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr ""
-
-#: actions/twitapifavorites.php:95
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr ""
-
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr ""
-
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-msgstr ""
-
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr ""
-
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
-msgstr ""
-
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
-msgstr ""
-
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
-msgstr ""
-
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr ""
-
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
-msgstr ""
-
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr ""
-
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
-msgstr ""
-
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
-
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
-
-#: actions/twittersettings.php:122
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
-msgstr ""
-
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
-msgstr ""
-
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
-msgstr ""
-
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
-msgstr ""
-
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
-msgstr ""
-
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
-msgstr ""
-
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
-msgstr ""
-
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
-msgstr ""
-
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
-msgstr ""
-
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
-msgstr ""
-
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
-msgstr ""
-
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
-msgstr ""
-
-#: classes/Channel.php:113
-msgid "Command results"
-msgstr ""
-
-#: classes/Channel.php:148
-msgid "Command complete"
-msgstr ""
-
-#: classes/Channel.php:158
-msgid "Command failed"
-msgstr ""
-
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
-
-#: classes/Command.php:96
-#, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr ""
-
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
-msgstr ""
-
-#: classes/Command.php:146
-msgid "Notice marked as fave."
-msgstr ""
-
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr ""
-
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
-msgstr ""
-
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
-msgstr ""
-
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
-msgstr ""
-
-#: classes/Command.php:178
-#, php-format
-msgid "About: %s"
-msgstr ""
-
-#: classes/Command.php:200
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr ""
-
-#: classes/Command.php:214
-#, php-format
-msgid "Direct message to %s sent"
-msgstr ""
-
-#: classes/Command.php:216
-msgid "Error sending direct message."
-msgstr ""
-
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
-
-#: classes/Command.php:270
-#, php-format
-msgid "Subscribed to %s"
-msgstr ""
-
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
-
-#: classes/Command.php:295
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr ""
-
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
-msgstr ""
-
-#: classes/Command.php:313
-msgid "Notification off."
-msgstr ""
-
-#: classes/Command.php:315
-msgid "Can't turn off notification."
-msgstr ""
-
-#: classes/Command.php:333
-msgid "Notification on."
-msgstr ""
-
-#: classes/Command.php:335
-msgid "Can't turn on notification."
-msgstr ""
-
-#: classes/Command.php:344
-msgid "Commands:\n"
-msgstr ""
-
-#: classes/Message.php:53
-msgid "Could not insert message."
-msgstr ""
-
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
-msgstr ""
-
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr ""
-
-#: lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-msgstr ""
-
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
-msgstr ""
-
-#: lib/mail.php:253
-#, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
-msgstr ""
-
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
-msgstr ""
-
-#: lib/personal.php:65
-msgid "Favorites"
-msgstr ""
-
-#: lib/personal.php:66
-#, php-format
-msgid "%s's favorite notices"
-msgstr ""
-
-#: lib/personal.php:66
-msgid "User"
-msgstr ""
-
-#: lib/personal.php:75
-msgid "Inbox"
-msgstr ""
-
-#: lib/personal.php:76
-msgid "Your incoming messages"
-msgstr ""
-
-#: lib/personal.php:80
-msgid "Outbox"
-msgstr ""
-
-#: lib/personal.php:81
-msgid "Your sent messages"
-msgstr ""
-
-#: lib/settingsaction.php:99
-msgid "Twitter"
-msgstr ""
-
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
-msgstr ""
-
-#: lib/util.php:1718
-msgid "To"
-msgstr ""
-
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
-msgstr ""
diff --git a/locale/pl_PL/LC_MESSAGES/laconica.mo b/locale/pl_PL/LC_MESSAGES/laconica.mo
index 38a0f543d..2d425ab15 100644
--- a/locale/pl_PL/LC_MESSAGES/laconica.mo
+++ b/locale/pl_PL/LC_MESSAGES/laconica.mo
diff --git a/locale/pl_PL/LC_MESSAGES/laconica.po b/locale/pl_PL/LC_MESSAGES/laconica.po
index 0beb8e85a..cc2495a4d 100644
--- a/locale/pl_PL/LC_MESSAGES/laconica.po
+++ b/locale/pl_PL/LC_MESSAGES/laconica.po
@@ -13,28 +13,19 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Paweł Wilk <siefca@gnu.org>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
 
 #  Polish language has 3 plural forms.
 #  Special case is used for one and some numbers ending in 2, 3, or 4.
@@ -42,25 +33,74 @@ msgstr ""
 #  1         WINDOW   -> 1 OKNO
 #  x2 to x4  WINDOWS  -> x2 do x4 OKNA  (x != 1)
 #  5 or more WINDOWS  -> 5 lub więcej OKIEN
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Szukaj strumienia dla \"%s\""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../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."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 "z wyłączeniem tych prywatnych danych: e-maila, identyfikatora IM, numeru "
 "telefonu."
 
-#: ../actions/subscribe.php:84
+#: ../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 ""
+
+#: ../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/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s obserwuje teraz Twoje wpisy na %2$s."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -75,125 +115,284 @@ msgstr ""
 "KÅ‚aniam siÄ™,\n"
 "%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../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 "Status użytkownika %1$s na %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../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 ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
 #, php-format
 msgid "%s Public Stream"
 msgstr "Publiczny strumień %s"
 
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#: ../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 i przyjaciele"
 
-#: ../lib/util.php:233
+#: ../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
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
 #, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
-"**%%site.name%%** to serwis z mikroblogami prowadzony przez "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:235
+#: ../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%%** to serwis z mikroblogami prowadzony przez [%%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%%** to serwis do mikroblogowania."
 
-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
-". Współpracownicy powinni być wymienieni z imienia i nazwiska lub "
-"pseudonimu."
+". Współpracownicy powinni być wymienieni z imienia i nazwiska lub pseudonimu."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: 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 "Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych"
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
 msgstr "6 lub więcej znaków"
 
-#: ../actions/recoverpassword.php:165
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
+#: actions/recoverpassword.php:220
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 lub więcej znaków – nie zapomnij go!"
 
-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
 "Na Twój adres komunikatora został wysłany kod potwierdzający. Musisz "
 "zaakceptować otrzymywanie wiadomości od %s."
 
-#: ../lib/util.php:296
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55 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 ""
+
+#: ../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 ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
 msgstr "O serwisie"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "Akceptuj"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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 "Dodaj"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "Dodaj konto OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92
 msgid "Address"
 msgstr "Adres"
 
-#: ../actions/showstream.php:254
+#: ../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 "Wszyscy obserwowani"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
 #, php-format
 msgid "All updates for %s"
 msgstr "Wszystkie aktualizacje od %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Wszystkie aktualizacje pasujÄ…ce do wzorca wyszukiwania \"%s\""
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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 "Jesteś już zalogowany."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "Już obserwujesz!"
 
-#: ../actions/userauthorization.php:76
+#: ../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 "Pozwól na obserwację"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Automatycznie loguj mnie na konto. Nie używać w przypadku "
-"współdzielonych komputerów!"
+"Automatycznie loguj mnie na konto. Nie używać w przypadku współdzielonych "
+"komputerów!"
 
-#: ../actions/avatar.php:32
+#: ../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 "Awatar"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "Awatar załadowany."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -203,322 +402,580 @@ msgstr ""
 "Jabbera/GTalka przyszła wiadomość z dalszymi instrukcjami. (Nie zapomnij "
 "dodać %s do listy znajomych.)"
 
-#: ../lib/util.php:1136
+#: ../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
+#, fuzzy
 msgid "Before »"
 msgstr "Wcześniej »"
 
-#: ../actions/profilesettings.php:52
+#: ../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 mnie"
 
-#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
+#: ../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 "Wpis \"O mnie\" jest za długi (maks. 140 znaków)"
 
-#: ../actions/updateprofile.php:118
+#: ../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 "Nie można odczytać URL-a awatara '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+#: ../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 "Nie można zapisać nowego hasła."
 
-#: ../actions/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Nie można stworzyć instancji obiektu OpenID."
 
-#: ../actions/imsettings.php:154
+#: ../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/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "Zmień"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../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 "Potwierdź"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Potwierdź adres"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "Anulowano potwierdzenie."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Nie znaleziono kodu potwierdzajÄ…cego."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "Połącz"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "Połącz z istniejącym kontem"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Nie można utworzyć formularza OpenID: %s"
 
-#: ../lib/openid.php:160
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow 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 "Nie można przekierować do serwera: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166
 msgid "Could not save avatar info"
 msgstr "Nie można zapisać informacji o awatarze"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159
 msgid "Could not save new profile info"
 msgstr "Nie można zapisać informacji o nowym profilu"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Nie można potwierdzić e-maila."
+#: ../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 "Nie można przekształcić tokenów z żądaniami na tokeny dostępu."
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Nie można obserwować."
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: actions/confirmaddress.php:126 actions/emailsettings.php:375
+#: actions/imsettings.php:357 actions/smssettings.php:370
 msgid "Couldn't delete email confirmation."
 msgstr "Nie można skasować potwierdzenia adresu e-mail."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
 msgstr "Nie można usunąć obserwacji."
 
-#: ../actions/remotesubscribe.php:125
+#: ../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."
 msgstr "Nie można uzyskać tokena z żądaniem."
 
-#: ../actions/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: actions/emailsettings.php:337 actions/imsettings.php:311
+#: actions/smssettings.php:325
 msgid "Couldn't insert confirmation code."
 msgstr "Nie można wprowadzić kodu potwierdzającego."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
 msgid "Couldn't insert new subscription."
 msgstr "Nie można wprowadzić nowej obserwacji."
 
-#: ../actions/profilesettings.php:175
+#: ../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 "Nie można zapisać profilu."
 
-#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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 "Nie można zaktualizować użytkownika."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Utwórz"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
+#: actions/finishopenidlogin.php:98
 msgid "Create a new user with this nickname."
 msgstr "Załóż użytkownika o tym pseudonimie."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "Załóż nowe konto"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:231
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Tworzenie nowego konta użytkownika na podstawie identyfikatora OpenID."
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Potwierdzone adresy Jabbera/GTalka"
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../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 "Obecnie"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "BÅ‚Ä…d przy dodawaniu do bazy danych: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../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 "Opisz siÄ™ w 140 znakach"
 
-#: ../actions/register.php:181
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "E-mail"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Adres e-mailowy"
+#: ../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/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
 msgid "Email address already exists."
 msgstr "Taki e-mail już istnieje"
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
 msgstr "Potwierdzenie adresu e-mailowego"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../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 "Podaj pseudonim lub adres e-mailowy"
 
-#: ../actions/userauthorization.php:136
+#: ../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 "BÅ‚Ä…d podczas autoryzacji tokena"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:297
 msgid "Error connecting user to OpenID."
 msgstr "Błąd w podłączaniu użytkownika do OpenID."
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+#: actions/finishaddopenid.php:126
 msgid "Error connecting user."
 msgstr "Błąd w podłączaniu użytkownika."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
 msgid "Error inserting avatar"
 msgstr "BÅ‚Ä…d we wstawianiu awatara"
 
 #: ../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/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "BÅ‚Ä…d przy wprowadzaniu wpisu"
-
 #: ../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/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
 msgstr "BÅ‚Ä…d w zapisie potwierdzenia adresu."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
 msgid "Error saving remote profile"
 msgstr "BÅ‚Ä…d w zapisie zdalnego profilu."
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving the profile."
 msgstr "BÅ‚Ä…d w zapisie profilu."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
 msgid "Error saving the user."
 msgstr "Błąd w zapisie użytkownika."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164
 msgid "Error saving user; invalid."
 msgstr "Błąd podczas zapisywania użytkownika; niepoprawne dane."
 
-#: ../actions/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 actions/login.php:112 actions/login.php:138
+#: actions/recoverpassword.php:354 actions/register.php:198
 msgid "Error setting user."
 msgstr "Błąd w ustawianiu danych użytkownika."
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
 msgid "Error updating profile"
 msgstr "BÅ‚Ä…d podczas aktualizowania profilu"
 
 #: ../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/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+#: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
 msgstr "BÅ‚Ä…d kodu potwierdzajÄ…cego."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "Dotychczasowy pseudonim"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "FAQ"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "Uaktualnianie awatara nie powiodło się."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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 "Kanał dla znajomych użytkownika %s"
 
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../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 "Kanał dla odpowiedzi do użytkownika %s"
 
-#: ../actions/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, 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
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Z powodów bezpieczeństwa wprowadź proszę ponownie nazwę użytkownika i "
-"hasło przed zmianą swoich ustawień."
+"Z powodów bezpieczeństwa wprowadź proszę ponownie nazwę użytkownika i hasło "
+"przed zmianą swoich ustawień."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/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 "Pełna nazwa"
 
-#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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 "Pełna nazwa jest zbyt długa (max. 255 znaków)."
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "PoczÄ…tek"
 
-#: ../actions/profilesettings.php:49
+#: ../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 "Strona domowa"
 
-#: ../actions/profilesettings.php:87
+#: ../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 "Adres strony domowej nie jest poprawnym URL-em."
 
-#: ../actions/imsettings.php:61
+#: ../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 "Adres komunikatora"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "Ustawienia komunikatora"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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 ""
-"Jeśli już masz konto, zaloguj się używając nazwy użytkownika i hasła, "
-"aby połączyć je ze swoim identyfikatorem OpenID."
+"Jeśli już masz konto, zaloguj się używając nazwy użytkownika i hasła, aby "
+"połączyć je ze swoim identyfikatorem OpenID."
 
 #: ../actions/openidsettings.php:45
 msgid ""
@@ -528,531 +985,926 @@ msgstr ""
 "Jeśli chcesz skojarzyć konto OpenID ze swoim lokalnym kontem, wprowadź "
 "identyfikator w poniższe pole i kliknij \"Dodaj\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"Jeśli Twoje hasło gdzieś się zapodziało lub zostało zapomniane to "
-"możesz wygenerować nowe. Zostanie ono wysłane na adres e-mailowy "
-"skojarzony z Twoim kontem."
 
-#: ../actions/password.php:69
+#: ../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 "Stare hasło jest niepoprawne"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
 msgid "Incorrect username or password."
 msgstr "Błędna nazwa użytkownika lub hasło."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Instrukcje dotyczące przywrócenia hasła zostały wysłane na adres "
-"e-mailowy skojarzony z Twoim kontem."
+"Instrukcje dotyczące przywrócenia hasła zostały wysłane na adres e-mailowy "
+"skojarzony z Twoim kontem."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Błędny URL awatara '%s'"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Błędna strona domowa '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Błędny URL licencji '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
 msgid "Invalid notice content"
 msgstr "Błędna zawartość wpisu"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72
 msgid "Invalid notice uri"
 msgstr "Błędny URI wpisu"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "Błędny URL wpisu"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Błędny URL profilu '%s'."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135
 msgid "Invalid profile URL (bad format)"
 msgstr "Błędny URL profilu (zły format)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
 msgstr "Błędny URL profilu zwrócony przez serwer."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Niepoprawny rozmiar."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
 msgid "Invalid username or password."
 msgstr "Błędna nazwa użytkownika lub hasło."
 
-#: ../lib/util.php:237
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Działa pod kontrolą  oprogramowania [Laconica](http://laconi.ca/) "
-"służącego do prowadzenia mikroblogów, w wersji %s, dostępnego na "
-"licencji [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Działa pod kontrolą  oprogramowania [Laconica](http://laconi.ca/) służącego "
+"do prowadzenia mikroblogów, w wersji %s, dostępnego na licencji [GNU Affero "
+"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../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/imsettings.php:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
-"Adres Jabbera lub GTalka w postaci \"Użytkownik@przykladowadomena.org\". "
-"Nie zapomnij dodać %s do listy znajomych w swoim komunikatorze lub panelu "
-"GTalka."
+"Adres Jabbera lub GTalka w postaci \"Użytkownik@przykladowadomena.org\". Nie "
+"zapomnij dodać %s do listy znajomych w swoim komunikatorze lub panelu GTalka."
 
-#: ../actions/profilesettings.php:55
+#: ../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 ""
+
+#: ../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 "Lokalizacja"
 
-#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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 "Lokalizacja jest za długa (max. 255 znaków)."
 
-#: ../actions/login.php:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Zaloguj się używając konta  [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:122
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
 "Zaloguj się używając nazwy użytkownika i hasła. Nie masz ich jeszcze? "
 "[Zarejestruj się](%%action.register%%) i utwórz konto, albo użyj swojego "
 "[OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Wyloguj"
 
-#: ../actions/login.php:106
+#: ../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 "Zgubione hasło?"
 
-#: ../actions/showstream.php:281
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php: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 "W serwisie od"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "%s – mikroblog"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/finishopenidlogin.php:107 actions/register.php:429
 msgid "My text and files are available under "
 msgstr "Moje teksty i pliki sÄ… widoczne pod"
 
-#: ../actions/finishopenidlogin.php:71
+#: ../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 ""
+
+#: ../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 "Nowy pseudonim"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "Nowy wpis"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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 "Nowe hasło"
 
-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nowe hasło zapisano pomyślnie. Możesz się zalogować."
 
-#: ../actions/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../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 "Pseudonim"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59
+#: ../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 "Ten pseudonim jest już w użyciu. Wybierz inny."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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 "Pseudonim musi zawierać tylko małe litery i cyfry, bez znaków spacji."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
 msgstr "Pseudonim niedozwolony."
 
-#: ../actions/remotesubscribe.php:72
+#: ../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/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "Pseudonim lub e-mail"
 
-#: ../actions/imsettings.php:147
+#: ../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 "Brak identyfikatora Jabbera."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "Brak żądania autoryzacji!"
 
-#: ../actions/confirmaddress.php:33
+#: ../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 "Brak kodu potwierdzajÄ…cego."
 
-#: ../actions/newnotice.php:49
+#: ../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 "Brak zawartości!"
 
-#: ../actions/userbyid.php:27
+#: ../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 "Brak identyfikatora."
 
+#: ../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 "Zdalny serwer nie wysłał pseudonimu."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
 msgstr "Brak pseudonimu."
 
-#: ../actions/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: actions/emailsettings.php:363 actions/imsettings.php:345
+#: actions/smssettings.php:358
 msgid "No pending confirmation to cancel."
 msgstr "Brak oczekujących potwierdzeń do anulowania."
 
+#: ../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 "Serwer nie zwrócił żadnego URL-a."
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+#: actions/recoverpassword.php:266
 msgid "No registered email address for that user."
 msgstr "Brak zarejestrowanych adresów e-mailowych dla tego użytkownika."
 
-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
 msgid "No request found!"
 msgstr "Nie znaleziono żądania!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/groupsearch.php:81 actions/noticesearch.php:104
+#: actions/peoplesearch.php:85
 msgid "No results"
 msgstr "Brak wyników"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "Zerowy rozmiar."
 
-#: ../actions/openidsettings.php:135
+#: ../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/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+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 "Brak takiego identyfikatora OpenID."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "Brak takiego dokumentu."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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 "Brak takiego wpisu."
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+#: actions/recoverpassword.php:62
 msgid "No such recovery code."
 msgstr "Brak takiego kodu przywracania."
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
+#: actions/postnotice.php:60
 msgid "No such subscription"
 msgstr "Nie ma takiej obserwacji"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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 "Brak takiego użytkownika."
 
-#: ../lib/gallery.php:76
+#: ../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 "Nie ma kogo pokazać!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+#: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr "To nie jest kod przywracania."
 
-#: ../actions/imsettings.php:158
+#: ../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 "Niepoprawny identyfikator Jabbera"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "Niepoprawny identyfikator OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../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 "Niewłaściwy adres e-mailowy."
 
-#: ../actions/profilesettings.php:83 ../actions/register.php:61
+#: ../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 "Niewłaściwy pseudonim."
 
-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:159
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Błędny URL profilu (niepoprawne usługi)"
 
-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+#: actions/remotesubscribe.php:152
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Błędny URL profilu (nie zdefiniowany XRDS)"
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:143
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Błędny URL profilu (brak dokumentu YADIS)"
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
 msgstr "Brak obrazka lub plik uszkodzony."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "Brak autoryzacji."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "Nieoczekiwana odpowiedź!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/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 "Niezalogowany."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "Nie obserwujesz!."
 
-#: ../actions/showstream.php:82
+#: ../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 "Kanał wpisów dla %s"
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:94
 msgid "Notice has no profile"
 msgstr "Wpis nie ma przypisanego profilu"
 
-#: ../actions/showstream.php:297
+#: ../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 "Wpisy"
 
-#: ../actions/password.php:39
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "Stare hasło"
 
-#: ../lib/util.php:288
+#: ../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:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73
 msgid "OpenID Account Setup"
 msgstr "Ustawienia konta OpenID"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
 msgstr "Automatyczne zatwierdzanie OpenID"
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
 msgid "OpenID Login"
 msgstr "Użytkownik OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:102 actions/openidsettings.php:101
 msgid "OpenID URL"
 msgstr "URL usługi OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
+#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
 msgid "OpenID authentication cancelled."
 msgstr "Uwiarygadnianie OpenID przerwane."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
+#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Uwiarygadnianie OpenID nie powiodło się: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Awaria OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "Ustawienia OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "Częściowa wysyłka."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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 "Hasło"
 
-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:335
 msgid "Password and confirmation do not match."
 msgstr "Hasło i jego potwierdzenie nie pasują do siebie."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+#: actions/recoverpassword.php:331
 msgid "Password must be 6 chars or more."
 msgstr "Hasło musi mieć 6 lub więcej znaków."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
 msgid "Password recovery requested"
 msgstr "Zażądano odzyskania hasła"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../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 "Hasło zostało zapisane."
 
-#: ../actions/password.php:61 ../actions/register.php:65
+#: ../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 "Podane hasła nie pasują do siebie."
 
-#: ../actions/peoplesearch.php:33
+#: ../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"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Szukaj ludzi"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "Osobiste"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/userauthorization.php:78
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
 "Sprawdź proszę poniższe informacje, aby upewnić się czy na pewno chcesz "
-"obserwować wpisy tego użytkownika. Jeżeli to pomyłka lub chodziło o "
-"kogoÅ› innego kliknij \"Anuluj\"."
+"obserwować wpisy tego użytkownika. Jeżeli to pomyłka lub chodziło o kogoś "
+"innego kliknij \"Anuluj\"."
 
-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
+#: actions/imsettings.php:142
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Utwórz wpis kiedy zmieni się status na komunikatorze."
 
-#: ../actions/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "Preferencje zostały zapisane."
 
-#: ../lib/util.php:300
+#: ../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 "Prywatność"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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 z zachowywaniem wpisu."
 
-#: ../lib/stream.php:54
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "URL profilu"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
 msgstr "Ustawienia profilu"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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 "Nieznany profil"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Publiczny"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Publiczny Kanał Strumieni"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "Publiczna oÅ› czasu"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr "Przywróć"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198
 msgid "Recover password"
 msgstr "Odzyskiwanie hasła"
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
+#: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr "Kod przywracający dla nieznanego użytkownika."
 
-#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: actions/register.php:69 actions/register.php:436 lib/action.php:338
+#: lib/facebookaction.php:277 lib/logingroupnav.php:78
 msgid "Register"
 msgstr "Zarejestruj"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "Odrzuć"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../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 "Pamiętaj mnie"
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
 msgstr "Zdalny profil bez odpowiadajÄ…cego profilu lokalnego"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "Zdalna subskrypcja"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: 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 "Usuń"
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "Usuń konto OpenID"
 
@@ -1061,43 +1913,85 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Usunięcie jedynego konta OpenID uniemożliwi dalsze logowanie! Jeśli "
-"musisz je usunąć dodaj wcześniej jakieś inne."
+"Usunięcie jedynego konta OpenID uniemożliwi dalsze logowanie! Jeśli musisz "
+"je usunąć dodaj wcześniej jakieś inne."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
 msgid "Replies"
 msgstr "Odpowiedzi"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../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 "Odpowiedzi na %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "Wyzeruj"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "Ustaw ponownie hasło"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
 msgid "Same as password above"
 msgstr "Takie samo jak hasło wprowadzone powyżej"
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../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 "Zapisz"
 
-#: ../lib/searchaction.php:73 ../lib/util.php:277
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/action.php:325
 msgid "Search"
 msgstr "Szukaj"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "Szukaj Kanału Strumieni"
 
-#: ../actions/noticesearch.php:30
+#: ../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 "
@@ -1116,153 +2010,284 @@ msgstr ""
 "nazwiska, miejscowości lub zainteresowania. Użyj spacji aby oddzielić "
 "elementy wyszukiwania. Słowa muszą mieć minimum 3 znaki."
 
-#: ../lib/util.php:982
+#: ../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 "Wyślij"
 
-#: ../actions/imsettings.php:71
+#: ../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 "Wysyłaj mi wpisy przez Jabbera/GTalka"
 
-#: ../lib/util.php:282
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "Ustawienia zostały zapisane."
 
-#: ../actions/finishaddopenid.php:66
+#: ../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 "Ktoś inny posługuje się już tym identyfikatorem OpenID."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
+#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
 msgid "Something weird happened."
 msgstr "Stało się coś dziwnego."
 
-#: ../lib/util.php:302
+#: ../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 "Kod źródłowy"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../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 "Nie znaleziono zapisanego konta OpenID."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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 "Subskrybuj"
 
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../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 "Subskrybenci"
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "Subskrypcja uwierzytelniona"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "Subskrypcja odrzucona"
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../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 "Subskrypcje"
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
 msgid "System error uploading file."
 msgstr "Błąd systemowy podczas wysyłania pliku."
 
-#: ../actions/noticesearch.php:34
+#: ../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 "Szukaj tekstu"
 
-#: ../actions/openidsettings.php:140
+#: ../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:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "Ten adres został już potwierdzony"
 
-#: ../actions/confirmaddress.php:43
+#: ../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/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "Ten plik jest za duży."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr "Ten identyfikator Jabbera jest już do Ciebie przypisany."
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr "To nie jest Twój identyfikator Jabbera."
 
-#: ../actions/imsettings.php:201
+#: ../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 "To jest błędny adres komunikatora."
 
-#: ../actions/newnotice.php:52
+#: ../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 "Wpis za długi. Maksymalna długość to 140 znaków."
 
-#: ../actions/confirmaddress.php:86
+#: ../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/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Skojarzony z Twoim kontem adres \"%s\" został potwierdzony."
 
-#: ../actions/imsettings.php:241
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413
 msgid "The address was removed."
 msgstr "Adres został usunięty."
 
-#: ../actions/userauthorization.php:311
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"Twoje żądanie obserwacji zostało odrzucone, ale nie przekazano żadnego "
-"URL-a do zwrotnego komunikatu. Sprawdź w instrukcjach serwisu w jaki "
-"sposób dokładnie odbywa się odrzucanie subskrypcji. Twój token "
-"subskrypcji to:"
+"Twoje żądanie obserwacji zostało odrzucone, ale nie przekazano żadnego URL-a "
+"do zwrotnego komunikatu. Sprawdź w instrukcjach serwisu w jaki sposób "
+"dokładnie odbywa się odrzucanie subskrypcji. Twój token subskrypcji to:"
 
-#: ../actions/userauthorization.php:321
+#: ../actions/userauthorization.php:322
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"Twoje żądanie obserwacji zostało odrzucone, ale nie przekazano żadnego "
-"URL-a do zwrotnego komunikatu. Sprawdź w instrukcjach serwisu w jaki "
-"sposób dokładnie odbywa się odrzucanie subskrypcji."
+"Twoje żądanie obserwacji zostało odrzucone, ale nie przekazano żadnego URL-a "
+"do zwrotnego komunikatu. Sprawdź w instrukcjach serwisu w jaki sposób "
+"dokładnie odbywa się odrzucanie subskrypcji."
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Ludzie obserwujący wpisy użytkownika %s."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Ludzie obserwujÄ…cy Twoje wpisy."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Ludzie, których wpisy obserwuje użytkownik %s."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Ludzie których wpisy obserwujesz."
 
-#: ../actions/recoverpassword.php:87
+#: ../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/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
 msgstr "Kod potwierdzajÄ…cy jest przeterminowany. Zacznij jeszcze raz."
 
@@ -1271,58 +2296,104 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Ten formularz powinien wysłać się automatycznie. Jeśli tak się nie "
-"stanie kliknij Wyślij, aby przejść do Twojego dostawcy OpenID."
+"Ten formularz powinien wysłać się automatycznie. Jeśli tak się nie stanie "
+"kliknij Wyślij, aby przejść do Twojego dostawcy OpenID."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../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 ""
-"Jeżeli logujesz się po raz pierwszy do %s to twoje konto OpenID musi "
-"zostać skojarzone z kontem lokalnym. Możesz więc albo utworzyć nowe "
-"konto, albo połączyć je z posiadanym istniejącym."
+"Jeżeli logujesz się po raz pierwszy do %s to twoje konto OpenID musi zostać "
+"skojarzone z kontem lokalnym. Możesz więc albo utworzyć nowe konto, albo "
+"połączyć je z posiadanym istniejącym."
 
-#: ../lib/util.php:147
+#: ../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 "Ta strona nie jest dostępna dla medium, którego typ akceptujesz"
 
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
-"Aby się zapisać możesz się [zalogować](%%action.login%%) lub "
-"[zarejestrować](%%action.register%%). Jeśli już posiadasz konto w "
-"[kompatybilnym serwisie](%%doc.openmublog%%) wprowadź poniżej "
-"identyfikator URL."
+"Aby się zapisać możesz się [zalogować](%%action.login%%) lub [zarejestrować]"
+"(%%action.register%%). Jeśli już posiadasz konto w [kompatybilnym serwisie](%"
+"%doc.openmublog%%) wprowadź poniżej identyfikator URL."
 
-#: ../actions/profilesettings.php:51
+#: ../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 Twojej strony domowej, bloga, lub profilu na innej stronie"
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
+#: actions/remotesubscribe.php:110
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL Twojego profilu na kompatybilnym serwisie do mikroblogów"
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/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 "Nieoczekiwane przesłanie formularza."
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323
 msgid "Unexpected password reset."
 msgstr "Nieoczekiwane wyzerowanie hasła."
 
+#: ../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 "Nieznana wersja protokołu OMB."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1330,24 +2401,52 @@ msgstr ""
 "Prawo do kopiowania zawartości tej strony, chyba że zaznaczono inaczej, "
 "należy do tworzących jej treści i uwarunkowane zasadami"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Nierozpoznany typ adresu %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Zrezygnuj z subskrypcji"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../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 "Nieobsługiwana wersja OMB"
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr "Nieobsługiwany format pliku obrazu."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "Wyślij"
 
@@ -1359,116 +2458,215 @@ msgid ""
 "share."
 msgstr ""
 "Tu możesz wysłać nowego \"awatara\" (wizerunek użytkownika). Nie da się "
-"edytować obrazu po jego umieszczeniu w serwisie, więc upewnij się, że "
-"jest w miarę kwadratowy. Wysyłając go zgadzasz się na jego publikację "
-"na warunkach podanych w licencji strony. Użyj grafiki, która należy do "
-"Ciebie i którą możesz dzielić się z innymi."
+"edytować obrazu po jego umieszczeniu w serwisie, więc upewnij się, że jest w "
+"miarę kwadratowy. Wysyłając go zgadzasz się na jego publikację na warunkach "
+"podanych w licencji strony. Użyj grafiki, która należy do Ciebie i którą "
+"możesz dzielić się z innymi."
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../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 "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:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../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żytkownik nie ma profilu."
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "Pseudonim użytkownika"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
 msgstr "Co słychać, %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../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 "Gdzie jesteÅ›? (np. \"miasto, region, kraj\")"
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Nieprawidłowy typ obrazu dla '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Nieprawidłowy rozmiar obrazu dla '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../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 "Już masz ten identyfikator OpenID!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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 "Nie musisz ponownie się logować!"
 
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Tu możesz zmienić hasło. Wybierz porządne!"
 
-#: ../actions/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Możesz utworzyć nowe konto, aby rozpocząć wysyłanie wpisów."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Możesz usunąć łączność z serwerem OpenID ze swojego konta klikając "
-"\"Usuń\"."
+"Możesz usunąć łączność z serwerem OpenID ze swojego konta klikając \"Usuń\"."
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"Możesz wysyłać i odbierać wpisy przez komunikator Jabber/GTalk "
-"(%%doc.im%%). Poniżej możesz skonfigurować swój adres i ustawienia IM."
+"Możesz wysyłać i odbierać wpisy przez komunikator Jabber/GTalk (%%doc.im%%). "
+"Poniżej możesz skonfigurować swój adres i ustawienia IM."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 "W tym miejscu możesz zaktualizować informacje zawarte w Twoim osobistym "
 "profilu, aby inni mogli lepiej Cię poznać."
 
 #: ../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żesz skorzystać z lokalnej subskrypcji!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../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 ""
-"Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami "
-"licencji."
+"Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67
 msgid "You did not send us that profile"
 msgstr "Ten profil nie był wysłany przez Ciebie"
 
-#: ../actions/recoverpassword.php:134
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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 "Identyfikacja pomyślna. Wprowadź poniżej nowe hasło."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "URL Twojej usługi OpenID"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Twój pseudonim na tym serwerze lub adres e-mailowy użyty podczas "
-"rejestracji."
+"Twój pseudonim na tym serwerze lub adres e-mailowy użyty podczas rejestracji."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -1480,1369 +2678,2204 @@ msgstr ""
 "wykorzystaniem jednego konta użytkownika. Tu możesz zarządzać swoimi "
 "identyfikatorami OpenID."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "kilka sekund temu"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "około %d dni temu"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "około %d godzin temu"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr "około %d minut temu"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr "około %d miesięcy temu"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "blisko dzień temu"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "blisko minutÄ™ temu"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "blisko miesiÄ…c temu"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "blisko rok temu"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "blisko godzinÄ™ temu"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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 "w odpowiedzi na…"
 
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "odpowiedź"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "takie samo hasło jak powyżej"
 
-#: ../lib/util.php:1127
+#: ../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 "« następne"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
+#: 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/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: 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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
+msgid "%s favorite notices"
 msgstr ""
 
-#: ../actions/invite.php:168 actions/invite.php:176
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
+msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+#: 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:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
+#: actions/login.php:122 actions/login.php:264
+msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
+#: actions/login.php:126 actions/login.php:268
+msgid "Login with your username and password. "
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
+#: 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/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
+#: 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/register.php:213
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+msgid "No such user"
 msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
+#: actions/newmessage.php:117 actions/newmessage.php:67
+msgid "New message"
 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/noticesearch.php:95 actions/noticesearch.php:146
+msgid "Notice without matching profile"
 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/openidsettings.php:28 actions/openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+#: actions/outbox.php:53 actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+"Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
+msgid "You can update your personal profile info here "
 msgstr ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
+#: 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/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+msgid "This confirmation code is too old. "
 msgstr ""
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
 msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
 msgstr ""
 
-#: ../actions/register.php:202
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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...\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."
+"want to..."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: 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 "Could not follow user: %s is already on your list."
+msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
 msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
+#: actions/showstream.php:154
+msgid "Send a message"
 msgstr ""
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, php-format
+msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#, php-format
+msgid "Direct messages to %s"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
+msgid "No message text!"
 msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
+#: 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/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
-msgid "Feed for tag %s"
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
+#: 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 ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
+#: 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 ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+msgid "Twitter settings"
 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/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+msgid "Current verified Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
 msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
 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/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
+msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+msgid "Twitter settings saved."
 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/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
+msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
+#: 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/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+msgid "Twitter preferences saved."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
+msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
+msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+msgid "Command results"
 msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
+#: classes/Command.php:96 classes/Command.php:113
+#, php-format
+msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
+msgid "User has no last notice"
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
+#: classes/Command.php:146 classes/Command.php:166
+msgid "Notice marked as fave."
 msgstr ""
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
-msgid "Notices tagged with %s"
+msgid "Homepage: %s"
 msgstr ""
 
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
 msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
+#: classes/Command.php:295 classes/Command.php:335
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: 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:28 actions/register.php:28
-msgid "Registration not allowed."
+#: classes/Command.php:313 classes/Command.php:356
+msgid "Notification off."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
+#: classes/Message.php:53 classes/Message.php:56
+msgid "Could not insert message."
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
+#: classes/Message.php:63 classes/Message.php:66
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
 msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: lib/mail.php:253 lib/mail.php:512
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: lib/mailbox.php:43 lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: lib/openid.php:195 lib/openid.php:203
+msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+msgid "Favorites"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
 msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
 msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
+msgid "Twitter"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
+msgid "Twitter integration options"
 msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+msgid "Could not parse message."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s i przyjaciele"
+
+#: actions/avatarsettings.php:76
+msgid "You can upload your personal avatar."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Ustawienia"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "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 ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
 msgstr ""
 
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
+#: actions/avatarsettings.php:334 actions/grouplogo.php:391
+#: classes/User_group.php:112
+#, fuzzy
+msgid "Lost our file."
+msgstr "Brak takiego wpisu."
+
+#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
+#: actions/grouplogo.php:406 actions/grouplogo.php:440
+#: classes/User_group.php:129 classes/User_group.php:161
+msgid "Unknown file type"
 msgstr ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "Brak takiego użytkownika."
+
+#: actions/block.php:129
+msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/block.php:162
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Nie musisz ponownie się logować!"
+
+#: 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 "Adres został usunięty."
+
+#: actions/deletenotice.php:73
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
 #, php-format
-msgid "Updates from %1$s on %2$s!"
+msgid "Edit %s group"
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: 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/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: 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 "Brak pseudonimu."
+
+#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
+#: actions/groupmembers.php:83 actions/joingroup.php:88
+#: actions/showgroup.php:128
+#, fuzzy
+msgid "No such group"
+msgstr "Brak takiego wpisu."
+
+#: 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:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
+msgstr "Pseudonim musi zawierać tylko małe litery i cyfry, bez znaków spacji."
+
+#: actions/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "Wpis \"O mnie\" jest za długi (maks. 140 znaków)"
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Nie można zaktualizować użytkownika."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "Ustawienia zostały zapisane."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "BÅ‚Ä…d kodu potwierdzajÄ…cego."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
 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/emailsettings.php:157
+msgid "Send me email when someone "
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: actions/emailsettings.php:321
+#, fuzzy
+msgid "That email address already belongs "
+msgstr "Taki e-mail już istnieje"
+
+#: actions/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
 msgstr ""
+"Na Twój adres komunikatora został wysłany kod potwierdzający. Musisz "
+"zaakceptować otrzymywanie wiadomości od %s."
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/facebookhome.php:110
+msgid "Server error - couldn't get user!"
+msgstr ""
+
+#: actions/facebookhome.php:196
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "If you would like the %s app to automatically update "
 msgstr ""
 
-#: ../lib/mail.php:147
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, 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 "Allow %s to update my Facebook status"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: actions/facebookhome.php:218
+msgid "Skip"
+msgstr ""
+
+#: actions/facebookhome.php:235
+#, fuzzy
+msgid "No notice content!"
+msgstr "Brak zawartości!"
+
+#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+msgid "Pagination"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
+#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#, fuzzy
+msgid "After"
+msgstr "« następne"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#, fuzzy
+msgid "Before"
+msgstr "Wcześniej »"
+
+#: actions/facebookinvite.php:70
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "Kanał dla znajomych użytkownika %s"
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
 msgstr ""
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Nie można zaktualizować użytkownika."
+
+#: actions/facebooksettings.php:65
+msgid "There was a problem saving your sync preferences!"
 msgstr ""
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Preferencje zostały zapisane."
+
+#: actions/facebooksettings.php:90
+msgid "Automatically update my Facebook status with my notices."
 msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Favor"
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Profil"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
 msgstr ""
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Preferencje"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+#, fuzzy
+msgid "Popular notices"
+msgstr "Brak takiego wpisu."
+
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Brak takiego wpisu."
+
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/featured.php:71
 #, php-format
-msgid "%s favorite notices"
+msgid "Featured users, page %d"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/featured.php:99
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/inbox.php:28
-#, php-format
-msgid "Inbox for %s - page %d"
+#: actions/finishremotesubscribe.php:188
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/inbox.php:30
-#, php-format
-msgid "Inbox for %s"
+#: actions/groupbyid.php:79
+msgid "No ID"
 msgstr ""
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+msgid "Group logo"
 msgstr ""
 
-#: actions/invite.php:178
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Awatar załadowany."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Uaktualnianie awatara nie powiodło się."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: actions/login.php:126
-msgid "Login with your username and password. "
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
 msgstr ""
 
-#: actions/newmessage.php:65
-msgid "No recipient specified."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
+#: actions/groups.php:90
+#, php-format
+msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#, fuzzy
+msgid "Create a new group"
+msgstr "Załóż nowe konto"
+
+#: actions/groupsearch.php:57
+#, fuzzy, php-format
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
+"Szukaj ludzi w serwisie %%site.name%%. Kryteriami mogą być imiona i "
+"nazwiska, miejscowości lub zainteresowania. Użyj spacji aby oddzielić "
+"elementy wyszukiwania. Słowa muszą mieć minimum 3 znaki."
 
-#: actions/newmessage.php:108
-msgid "No such user"
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "Szukaj ludzi"
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
 msgstr ""
 
-#: actions/newmessage.php:117
-msgid "New message"
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
 msgstr ""
 
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
+#: actions/imsettings.php:147
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk "
+msgstr "Wysyłaj mi wpisy przez Jabbera/GTalka"
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Brak kodu potwierdzajÄ…cego."
+
+#: actions/joingroup.php:65
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/openidsettings.php:28
+#: actions/joingroup.php:95
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Nie musisz ponownie się logować!"
+
+#: actions/joingroup.php:128
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Nie można przekierować do serwera: %s"
+
+#: actions/joingroup.php:135
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgid "%s joined group %s"
 msgstr ""
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/leavegroup.php:65
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "Brak takiego wpisu."
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Ten profil nie był wysłany przez Ciebie"
+
+#: actions/leavegroup.php:100
+msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/outbox.php:28
-#, php-format
-msgid "Outbox for %s - page %d"
+#: actions/leavegroup.php:130
+msgid "Could not find membership record."
 msgstr ""
 
-#: actions/outbox.php:30
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Nie można utworzyć formularza OpenID: %s"
+
+#: actions/leavegroup.php:145
 #, php-format
-msgid "Outbox for %s"
+msgid "%s left group %s"
 msgstr ""
 
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
 msgstr ""
 
-#: actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
+#: actions/newgroup.php:177
+#, fuzzy
+msgid "Could not create group."
+msgstr "Nie można zapisać informacji o awatarze"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Nie można obserwować."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "Ten plik jest za duży."
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "Wpisy"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
 msgstr ""
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
+#: actions/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "Użytkownik OpenID"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Usuń konto OpenID"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Ustawienia"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
 msgstr ""
 
-#: actions/register.php:216
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "Szukaj"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Lokalizacja jest za długa (max. 255 znaków)."
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Zmień hasło"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "Hasło zostało zapisane."
+
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Niewłaściwy adres e-mailowy."
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:91
 #, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "Nieznany profil"
+
+#: actions/profilesettings.php:124
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/profilesettings.php:144
+msgid "Automatically subscribe to whoever "
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: actions/profilesettings.php:229 actions/tagother.php:176
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Błędna strona domowa '%s'"
+
+#: actions/profilesettings.php:311
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Nie można zapisać profilu."
+
+#: actions/public.php:107
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Publiczna oÅ› czasu"
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/public.php:220
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
 
-#: actions/showfavorites.php:61
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Publiczny Kanał Strumieni"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Feed for favorites of %s"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/showmessage.php:33
-msgid "No such message."
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/register.php:149
+#, fuzzy
+msgid "You can't register if you don't "
 msgstr ""
+"Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
 
-#: actions/showmessage.php:61
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: actions/register.php:286
+msgid "With this form you can create "
+msgstr ""
+
+#: actions/register.php:368
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, "
+msgstr "Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych"
+
+#: actions/register.php:382 actions/register.php:386
+#, fuzzy
+msgid "Used only for updates, announcements, "
+msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
+
+#: actions/register.php:398
+#, fuzzy
+msgid "URL of your homepage, blog, "
+msgstr "URL Twojej strony domowej, bloga, lub profilu na innej stronie"
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Opisz siÄ™ w 140 znakach"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "Gdzie jesteÅ›? (np. \"miasto, region, kraj\")"
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
 msgstr ""
+"z wyłączeniem tych prywatnych danych: e-maila, identyfikatora IM, numeru "
+"telefonu."
 
-#: actions/showmessage.php:66
+#: actions/register.php:471
 #, php-format
-msgid "Message from %1$s on %2$s"
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: 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/smssettings.php:312
+#: actions/replies.php:118
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Odpowiedzi na %s"
+
+#: actions/showfavorites.php:79
 #, php-format
-msgid "Mobile carrier for your phone. "
+msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
-msgid "Direct messages to %s"
+msgid "%s group"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/showgroup.php:79
 #, php-format
-msgid "All the direct messages sent to %s"
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
+#: actions/showgroup.php:206
+#, fuzzy
+msgid "Group profile"
+msgstr "Brak takiego wpisu."
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
+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 "Wpisy"
+
+#: actions/showgroup.php:270
+msgid "Group actions"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Kanał wpisów dla %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
+msgid "Members"
+msgstr "W serwisie od"
+
+#: actions/showgroup.php:363 actions/showstream.php:413
+#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr ""
+
+#: actions/showgroup.php:370
+msgid "All members"
+msgstr ""
+
+#: actions/showgroup.php:378
 #, php-format
-msgid "All the direct messages sent from %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Profil"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "Użytkownik nie ma profilu."
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Subskrybenci"
+
+#: actions/showstream.php:533
+msgid "All groups"
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/showstream.php:542
 #, php-format
-msgid "%s / Favorites from %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+
+#: actions/smssettings.php:128
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, "
+msgstr "Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych"
+
+#: actions/smssettings.php:162
+#, fuzzy
+msgid "Send me notices through SMS; "
+msgstr "Wysyłaj mi wpisy przez Jabbera/GTalka"
+
+#: actions/smssettings.php:335
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. "
+msgstr "Ten kod potwierdzajÄ…cy nie jest przeznaczony dla Ciebie!"
+
+#: actions/smssettings.php:453
+msgid "Mobile carrier"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/subedit.php:70
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Ten profil nie był wysłany przez Ciebie"
+
+#: actions/subedit.php:83
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Nie można obserwować."
+
+#: actions/subscribe.php:55
+#, fuzzy
+msgid "Not a local user."
+msgstr "Brak takiego użytkownika."
+
+#: actions/subscribe.php:69
+#, fuzzy
+msgid "Subscribed"
+msgstr "Subskrybuj"
+
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Subskrybenci"
+
+#: actions/subscribers.php:52
 #, php-format
-msgid "%s updates favorited by %s / %s."
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/subscribers.php:63
+#, fuzzy
+msgid "These are the people who listen to "
+msgstr "Ludzie obserwujący wpisy użytkownika %s."
+
+#: actions/subscribers.php:67
+#, fuzzy, php-format
+msgid "These are the people who "
+msgstr "Ludzie obserwujący wpisy użytkownika %s."
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Wszyscy obserwowani"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Wszyscy obserwowani"
+
+#: actions/subscriptions.php:65
+#, fuzzy
+msgid "These are the people whose notices "
+msgstr "Ludzie, których wpisy obserwuje użytkownik %s."
+
+#: actions/subscriptions.php:69
+#, fuzzy, php-format
+msgid "These are the people whose "
+msgstr "Ludzie obserwujący wpisy użytkownika %s."
+
+#: actions/subscriptions.php:122
+#, fuzzy
+msgid "Jabber"
+msgstr "Brak identyfikatora Jabbera."
+
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "%s – mikroblog"
+
+#: actions/tag.php:66
 #, php-format
-msgid "%s added your notice as a favorite"
+msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/tagother.php:33
+#, fuzzy
+msgid "Not logged in"
+msgstr "Niezalogowany."
+
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No id argument."
+msgstr "Brak takiego dokumentu."
+
+#: actions/tagother.php:65
 #, php-format
+msgid "Tag %s"
+msgstr ""
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr ""
+
+#: actions/tagother.php:149
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/tagother.php:164
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/tagother.php:191
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
+#: actions/tagother.php:198
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Nie można zapisać informacji o awatarze"
+
+#: actions/tagother.php:233
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "Brak takiego wpisu."
+
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "%s – mikroblog"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
 msgstr ""
 
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "Nie znaleziono żądania!"
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Nowe hasło"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
 msgstr ""
 
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
 msgstr ""
 
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
+#: actions/twittersettings.php:341
+#, fuzzy, php-format
+msgid "Unable to retrieve account information "
+msgstr "Nie można skasować potwierdzenia adresu e-mail."
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Błąd w zapisie użytkownika."
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Serwer nie zwrócił żadnego URL-a."
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Zdalny profil bez odpowiadajÄ…cego profilu lokalnego"
+
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Zrezygnuj z subskrypcji"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
 msgstr ""
 
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Problem z zachowywaniem wpisu."
+
+#: classes/Notice.php:109
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Uaktualnianie awatara nie powiodło się."
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr ""
+
+#: lib/action.php:130
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgid "%s - %s"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
+#: lib/action.php:145
+msgid "Untitled page"
 msgstr ""
 
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
+#: lib/action.php:316
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
+#: lib/action.php:325
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "O serwisie"
+
+#: lib/action.php:328
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
+#: lib/action.php:332
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
+#: lib/action.php:335
+msgid "Login to the site"
 msgstr ""
 
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Załóż nowe konto"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "Brak takiego identyfikatora OpenID."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Pomoc"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "Nowy wpis"
+
+#: lib/action.php:417
+msgid "Local views"
 msgstr ""
 
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "Nowy wpis"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Subskrypcje"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
 msgstr ""
 
-#: classes/Channel.php:113
-msgid "Command results"
+#: lib/action.php:630
+msgid "All "
 msgstr ""
 
-#: classes/Channel.php:148
-msgid "Command complete"
+#: lib/action.php:635
+msgid "license."
 msgstr ""
 
-#: classes/Channel.php:158
-msgid "Command failed"
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Brak takiego użytkownika."
+
+#: lib/blockform.php:153
+msgid "Block"
 msgstr ""
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
 msgstr ""
 
-#: classes/Command.php:96
+#: lib/facebookaction.php:268
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
+#: lib/facebookaction.php:271
+#, fuzzy
+msgid " a new account."
+msgstr "Załóż nowe konto"
+
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#, fuzzy
+msgid "Published"
+msgstr "Publiczny"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
+msgid "Favor this notice"
+msgstr "Brak takiego wpisu."
+
+#: lib/feedlist.php:64
+msgid "Export data"
 msgstr ""
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
+#: lib/galleryaction.php:121
+msgid "Filter tags"
 msgstr ""
 
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
+#: lib/galleryaction.php:131
+msgid "All"
 msgstr ""
 
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
+#: lib/galleryaction.php:137
+msgid "Tag"
 msgstr ""
 
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
+#: lib/galleryaction.php:139
+msgid "Go"
 msgstr ""
 
-#: classes/Command.php:178
-#, php-format
-msgid "About: %s"
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "URL Twojej strony domowej, bloga, lub profilu na innej stronie"
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Subskrypcje"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Opisz siÄ™ w 140 znakach"
+
+#: lib/groupeditform.php:158
+#, fuzzy
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr "Gdzie jesteÅ›? (np. \"miasto, region, kraj\")"
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
 msgstr ""
 
-#: classes/Command.php:200
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Edit %s group properties"
 msgstr ""
 
-#: classes/Command.php:214
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Wyloguj"
+
+#: lib/groupnav.php:107
 #, php-format
-msgid "Direct message to %s sent"
+msgid "Add or edit %s logo"
 msgstr ""
 
-#: classes/Command.php:216
-msgid "Error sending direct message."
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
 msgstr ""
 
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
 msgstr ""
 
-#: classes/Command.php:270
+#: lib/grouptagcloudsection.php:56
 #, php-format
-msgid "Subscribed to %s"
+msgid "Tags in %s group's notices"
 msgstr ""
 
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Ta strona nie jest dostępna dla medium, którego typ akceptujesz"
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Login"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Zapisz"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Błędna nazwa użytkownika lub hasło."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Załóż nowe konto"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
 msgstr ""
 
-#: classes/Command.php:295
+#: lib/mail.php:175
 #, php-format
-msgid "Unsubscribed from %s"
+msgid ""
+"Hey, %s.\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s obserwuje teraz Twoje wpisy na %2$s."
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Lokalizacja"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Strona domowa"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:313
-msgid "Notification off."
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
 msgstr ""
 
-#: classes/Command.php:315
-msgid "Can't turn off notification."
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr ""
 
-#: classes/Command.php:333
-msgid "Notification on."
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s obserwuje teraz Twoje wpisy na %2$s."
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
 msgstr ""
 
-#: classes/Command.php:335
-msgid "Can't turn on notification."
+#: lib/messageform.php:110
+msgid "Send a direct notice"
 msgstr ""
 
-#: classes/Command.php:344
-msgid "Commands:\n"
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "Nowy wpis"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 lub więcej znaków"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "w odpowiedzi na…"
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
 msgstr ""
 
-#: classes/Message.php:53
-msgid "Could not insert message."
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "odpowiedź"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+msgid "Delete this notice"
 msgstr ""
 
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
+#: lib/noticelist.php:474
+msgid "Delete"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
 msgstr ""
 
-#: lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: lib/nudgeform.php:128
+msgid "Nudge"
 msgstr ""
 
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/personaltagcloudsection.php:56
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
+#: lib/profilelist.php:182
+msgid "(none)"
 msgstr ""
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
-msgstr ""
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Publiczny"
 
-#: lib/personal.php:65
-msgid "Favorites"
+#: lib/publicgroupnav.php:80
+msgid "User groups"
 msgstr ""
 
-#: lib/personal.php:66
-#, php-format
-msgid "%s's favorite notices"
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
 msgstr ""
 
-#: lib/personal.php:66
-msgid "User"
+#: lib/publicgroupnav.php:86
+msgid "Featured"
 msgstr ""
 
-#: lib/personal.php:75
-msgid "Inbox"
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "Szukaj ludzi"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Wpisy"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
 msgstr ""
 
-#: lib/personal.php:76
-msgid "Your incoming messages"
+#: lib/section.php:89
+msgid "Untitled section"
 msgstr ""
 
-#: lib/personal.php:80
-msgid "Outbox"
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Zdalna subskrypcja"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Zdalna subskrypcja"
+
+#: lib/subgroupnav.php:97
+#, php-format
+msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/personal.php:81
-msgid "Your sent messages"
+#: lib/subgroupnav.php:104
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/settingsaction.php:99
-msgid "Twitter"
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Użytkownik nie ma profilu."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Subskrypcja uwierzytelniona"
+
+#: lib/tagcloudsection.php:56
+msgid "None"
 msgstr ""
 
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
+#: lib/topposterssection.php:74
+msgid "Top posters"
 msgstr ""
 
-#: lib/util.php:1718
-msgid "To"
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "Brak takiego użytkownika."
+
+#: lib/unblockform.php:150
+msgid "Unblock"
 msgstr ""
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "Załóż nowe konto"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Nie można potwierdzić e-maila."
+
+#~ msgid "Email address"
+#~ msgstr "Adres e-mailowy"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "BÅ‚Ä…d przy wprowadzaniu wpisu"
+
+#~ msgid ""
+#~ "If you've forgotten or lost your password, you can get a new one sent  "
+#~ "the email address you have stored  in your account."
+#~ msgstr ""
+#~ "Jeśli Twoje hasło gdzieś się zapodziało lub zostało zapomniane to możesz "
+#~ "wygenerować nowe. Zostanie ono wysłane na adres e-mailowy skojarzony z "
+#~ "Twoim kontem."
diff --git a/locale/pt/LC_MESSAGES/laconica.mo b/locale/pt/LC_MESSAGES/laconica.mo
index bca591d88..60436f4ad 100644
--- a/locale/pt/LC_MESSAGES/laconica.mo
+++ b/locale/pt/LC_MESSAGES/laconica.mo
diff --git a/locale/pt/LC_MESSAGES/laconica.po b/locale/pt/LC_MESSAGES/laconica.po
index 6cb7250ae..0f6533f84 100644
--- a/locale/pt/LC_MESSAGES/laconica.po
+++ b/locale/pt/LC_MESSAGES/laconica.po
@@ -3,45 +3,49 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-01-24 22:20+0000\n"
+"Last-Translator: Tony Manco <trmanco@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"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 ""
+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."
+" except this private data: password, email address, IM address, phone number."
 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 ""
+msgstr "de"
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:347
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgstr "%1$s / Actualizações respondendo a %2$s"
 
-#: ../actions/invite.php:168 actions/invite.php:176
+#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgstr "%1$s convidou-o a juntar-se a ele no %2$s"
 
 #: ../actions/invite.php:170
 #, php-format
@@ -73,11 +77,36 @@ msgid ""
 "\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 lhe permite deixar actualizado "
+"pessoas que conheço e que lhe interessam.\n"
+"\n"
+"Também pode partilhar notícias suas, pensamentos or a sua vida online com "
+"pessoas que conheça. É também ideal para conhecer pessoas com interesses "
+"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"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
 
 #: ../lib/mail.php:126
 #, php-format
@@ -89,116 +118,147 @@ msgid ""
 "Faithfully yours,\n"
 "%4$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/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 ""
+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
 #, php-format
 msgid "%1$s's status on %2$s"
-msgstr ""
+msgstr "%1$s's estado em %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
+#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
 #, php-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
 #, php-format
 msgid "%s Public Stream"
-msgstr ""
+msgstr "Fluxo Público de %s"
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
 #: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
 #: 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 ""
+msgstr "%s e amigos"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33
 #, php-format
 msgid "%s public timeline"
-msgstr ""
+msgstr "Mensagens públicas de %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
 msgid "%s status"
-msgstr ""
+msgstr "Estado de %s"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
 #, php-format
 msgid "%s timeline"
-msgstr ""
+msgstr "Mensagens de %s"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
 #, php-format
 msgid "%s updates from everyone!"
-msgstr ""
+msgstr "%s actualizações de todos!"
 
 #: ../actions/register.php:213
 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 "
+"como confirmar o seu endereço de email.)"
 
-#: ../lib/util.php:257 lib/util.php:273
+#: ../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%%). "
+"**%%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%%)."
 
-#: ../lib/util.php:259 lib/util.php:275
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
-msgstr ""
+msgstr "**%%site.name%%** é um serviço de microblogging. "
 
 #: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
-msgstr ""
+msgstr ". Os colaboradores devem ser citados usando 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 ""
+msgstr "1-64 letras ou números, sem pontuação ou espaços"
 
 #: ../actions/register.php:152 actions/register.php:166
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
+msgstr "1-64 letras 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 ""
+msgstr "6 ou mais caracteres"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
+#: actions/recoverpassword.php:220
 msgid "6 or more characters, and don't forget it!"
-msgstr ""
+msgstr "6 ou mais caracteres, e não a esqueça!"
 
 #: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
 msgid "6 or more characters. Required."
-msgstr ""
+msgstr "6 ou mais caracteres. Obrigatório."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
+"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."
 msgstr ""
+"Um código de confirmação foi enviado para o endereço de email fornecido. "
+"Procure na sua 'Caixa de Entrada' (e caixa de spam) a mensagem com o código "
+"e instrucções."
 
 #: ../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 ""
+"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
@@ -210,9 +270,17 @@ msgstr ""
 #: 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/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 ""
+msgstr "Método da API não encontrado!"
 
 #: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
 #: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
@@ -228,96 +296,119 @@ msgstr ""
 #: 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/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 ""
+msgstr "Método da API em construcção."
 
-#: ../lib/util.php:324 lib/util.php:340
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
-msgstr ""
+msgstr "Sobre"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
-msgstr ""
+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/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 ""
+msgstr "Adicionar"
 
 #: ../actions/openidsettings.php:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
-msgstr ""
+msgstr "Adicionar OpenID"
 
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
-msgstr ""
+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 ""
+msgstr "Endereço"
 
-#: ../actions/invite.php:131 actions/invite.php:139
+#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
 msgid "Addresses of friends to invite (one per line)"
-msgstr ""
+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 ""
+msgstr "Todas as subscrições"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
 #, php-format
 msgid "All updates for %s"
-msgstr ""
+msgstr "Todas as actualizações de %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, php-format
 msgid "All updates matching search term \"%s\""
-msgstr ""
+msgstr "Todas as actualizações com o 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 ""
+msgstr "Login já efectuado."
 
-#: ../lib/subs.php:42 lib/subs.php:42
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
-msgstr ""
+msgstr "Já subscrito!."
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+#: actions/deletenotice.php:113
 msgid "Are you sure you want to delete this notice?"
-msgstr ""
+msgstr "Tem a certeza que permite remover esta mensagem?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
+#: actions/userauthorization.php:81
 msgid "Authorize subscription"
-msgstr ""
+msgstr "Autorizar subscrição"
 
 #: ../actions/login.php:104 ../actions/register.php:178
 #: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 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)"
+"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/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34
+#: actions/profilesettings.php:34 actions/avatarsettings.php:65
+#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
 msgid "Avatar"
-msgstr ""
+msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
-msgstr ""
+msgstr "Avatar actualizado."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
@@ -325,108 +416,134 @@ 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/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 ""
+"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 ""
+msgstr "A aguardar confirmação deste número de telefone."
 
 #: ../lib/util.php:1318 lib/util.php:1452
+#, fuzzy
 msgid "Before »"
-msgstr ""
+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 ""
+msgstr "Bio"
 
 #: ../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 ""
+msgstr "Bio é demasiada extensa (máx 140 car)."
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
 msgid "Can't delete this notice."
-msgstr ""
+msgstr "Não é possível remover a mensagem."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
+#: actions/updateprofile.php:123
 #, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr ""
+msgstr "Não é possível ler o 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 ""
+msgstr "Não é possível salvar a nova 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 ""
+msgstr "Cancelar"
 
-#: ../lib/openid.php:121 lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
+msgstr "Não é possível instanciar um objecto do OpenID."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
 msgid "Cannot normalize that Jabber ID"
-msgstr ""
+msgstr "Não é possível normalizar esse ID de Jabber"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
 msgid "Cannot normalize that email address"
-msgstr ""
+msgstr "Não é possível normalizar esse endereço de email"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
-msgstr ""
+msgstr "Modificar"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
 msgid "Change email handling"
 msgstr ""
 
 #: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
-msgstr ""
+msgstr "Modificar palavra-passe"
 
-#: ../lib/settingsaction.php:94
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
 msgid "Change your password"
-msgstr ""
+msgstr "Modificar a sua palavra-passe"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: lib/accountsettingsaction.php:105
 msgid "Change your profile settings"
-msgstr ""
+msgstr "Modificar as suas definições de perfil"
 
 #: ../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 ""
+msgstr "Confirmar"
 
 #: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
-msgstr ""
+msgstr "Confirmar Endereço"
 
 #: ../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 ""
+msgstr "Confirmação cancelada."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
 msgid "Confirmation code"
-msgstr ""
+msgstr "Código de confirmação"
 
 #: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
-msgstr ""
+msgstr "Código de confirmação não encontrado"
 
 #: ../actions/register.php:202
 #, php-format
@@ -448,59 +565,66 @@ msgid ""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
-msgstr ""
+msgstr "Ligar"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
-msgstr ""
+msgstr "Ligar conta existente"
 
-#: ../lib/util.php:332 lib/util.php:348
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
-#: ../lib/openid.php:178 lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
 #, 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."
 msgstr ""
 
-#: ../lib/openid.php:160 lib/openid.php:160
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
 #, php-format
 msgid "Could not redirect to server: %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 ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
+#: ../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: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:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
@@ -508,43 +632,52 @@ msgstr ""
 #: ../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: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."
 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: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 ""
 
@@ -556,34 +689,46 @@ msgstr ""
 #: 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 ""
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+#: actions/emailsettings.php:99
 msgid "Current confirmed email address."
 msgstr ""
 
@@ -591,164 +736,186 @@ msgstr ""
 msgid "Currently"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
 #: ../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 ""
 
 #: ../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: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: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: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 ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
+#: ../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 ""
 
 #: ../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:153 actions/finishremotesubscribe.php:166
 msgid "Error inserting avatar"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
+#: 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: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: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: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/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: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/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/allrss.php:64 actions/all.php:75 actions/allrss.php:107
 #, php-format
 msgid "Feed for friends of %s"
 msgstr ""
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66
+#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
+#: actions/repliesrss.php:71
 #, php-format
 msgid "Feed for replies to %s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
 #, 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 ""
 
@@ -760,50 +927,66 @@ 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 ""
 
-#: ../lib/util.php:322 lib/util.php:338
+#: ../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/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 ""
 
 #: ../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/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."
@@ -823,18 +1006,22 @@ 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 ""
 
-#: ../actions/login.php:67 actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
 msgid "Incorrect username or password."
 msgstr ""
 
@@ -845,86 +1032,99 @@ msgid ""
 msgstr ""
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
 #, php-format
 msgid "Invalid email address: %s"
 msgstr ""
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr ""
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr ""
 
 #: ../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 ""
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr ""
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr ""
 
 #: ../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:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
 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: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: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/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:123 actions/invite.php:130 actions/invite.php:104
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, php-format
 msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: actions/imsettings.php:296
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
@@ -936,31 +1136,45 @@ msgid ""
 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)."
 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 ""
 
 #: ../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 ""
@@ -968,20 +1182,22 @@ msgstr ""
 #: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
 
-#: ../lib/util.php:308 lib/util.php:324
+#: ../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:110 actions/login.php:110 actions/login.php:245
+#: lib/facebookaction.php:320
 msgid "Lost or forgotten password?"
 msgstr ""
 
@@ -991,15 +1207,17 @@ 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%%."
 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:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr ""
@@ -1013,33 +1231,39 @@ 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 ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
+#: ../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: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 ""
 
@@ -1050,12 +1274,19 @@ 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 ""
 
@@ -1063,131 +1294,160 @@ msgstr ""
 #: ../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 ""
 
 #: ../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/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: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/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
+#: 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/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: 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
 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/twitapistatuses.php:520 actions/twitapifavorites.php:112
+#: actions/twitapistatuses.php:446
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
 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: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: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 ""
 
@@ -1206,11 +1466,21 @@ msgstr ""
 #: 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
+#: 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 ""
 
@@ -1219,67 +1489,79 @@ 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: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 ""
 
-#: ../lib/openid.php:131 lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr ""
 
 #: ../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: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 ""
 
 #: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+#: actions/remotesubscribe.php:152
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:143
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:309
 msgid "Not found"
 msgstr ""
 
@@ -1290,144 +1572,175 @@ msgstr ""
 #: 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
+#: 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: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 ""
 
 #: ../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:81 actions/tag.php:41
 #, 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/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
+#: lib/logingroupnav.php:81
 msgid "OpenID"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73
 msgid "OpenID Account Setup"
 msgstr ""
 
-#: ../lib/openid.php:180 lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
 msgid "OpenID Login"
 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/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/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:133 lib/openid.php:133 lib/openid.php:142
 #, 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:135 actions/invite.php:143 actions/invite.php:180
 msgid "Optionally add a personal message to the invitation."
 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/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 ""
 
 #: ../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/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/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"
 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/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:133 actions/invite.php:141 actions/invite.php:178
 msgid "Personal message"
 msgstr ""
 
@@ -1443,66 +1756,79 @@ msgid ""
 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/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/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"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344
+#: ../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: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/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:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr ""
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1512,44 +1838,55 @@ 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/register.php:200 actions/register.php:214
+#: actions/register.php:67
 msgid "Registration successful"
 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/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414
 msgid "Remember me"
 msgstr ""
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr ""
 
@@ -1559,11 +1896,15 @@ msgstr ""
 #: 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/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/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr ""
 
@@ -1573,45 +1914,54 @@ msgid ""
 "remove it, add another OpenID first."
 msgstr ""
 
-#: ../lib/stream.php:55 lib/personal.php:55
+#: ../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 ""
 
 #: ../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 ""
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
 msgid "SMS Phone number"
 msgstr ""
 
 #: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
 msgid "SMS confirmation"
 msgstr ""
 
 #: ../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 ""
 
@@ -1619,20 +1969,27 @@ msgstr ""
 #: ../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/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/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 ""
 
 #: ../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 "
@@ -1647,24 +2004,29 @@ msgid ""
 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
+#: 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 ""
 
@@ -1678,11 +2040,12 @@ msgstr ""
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../lib/util.php:304 lib/util.php:320
+#: ../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 ""
 
@@ -1691,66 +2054,83 @@ 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 ""
 
 #: ../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/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 ""
 
 #: ../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
+#: 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 ""
 
@@ -1759,18 +2139,22 @@ 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 ""
 
 #: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr ""
 
 #: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
 msgstr ""
 
@@ -1779,52 +2163,64 @@ 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/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
 msgid "That is already your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
 msgid "That is already your phone number."
 msgstr ""
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr ""
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:62
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
@@ -1836,6 +2232,8 @@ 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 ""
 
@@ -1871,10 +2269,9 @@ msgstr ""
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
+#: ../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:"
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
 #: ../actions/recoverpassword.php:88
@@ -1888,6 +2285,7 @@ msgid ""
 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 "
@@ -1897,14 +2295,17 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
+#: 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/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 ""
 
@@ -1913,32 +2314,36 @@ 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/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php: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 ""
 
@@ -1946,20 +2351,24 @@ msgstr ""
 #: ../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/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
+#: ../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:60 actions/finishremotesubscribe.php:61
 msgid "Unknown version of OMB protocol."
 msgstr ""
 
@@ -1970,42 +2379,51 @@ msgid ""
 msgstr ""
 
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
 #: ../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 ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr ""
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
 msgid "Updates by instant messenger (IM)"
 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 ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
 #, 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 ""
 
@@ -2021,10 +2439,9 @@ msgstr ""
 msgid "Upload a new profile image"
 msgstr ""
 
-#: ../actions/invite.php:114 actions/invite.php:121
+#: ../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."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
@@ -2033,7 +2450,7 @@ msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
 msgid "User being listened to doesn't exist."
 msgstr ""
 
@@ -2047,10 +2464,16 @@ msgstr ""
 #: 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/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr ""
 
@@ -2059,35 +2482,42 @@ msgid "User not found."
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
 msgid "What timezone are you normally in?"
 msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %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\""
 msgstr ""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, 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
 msgid "Yes"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
+#: actions/finishaddopenid.php:112
 msgid "You already have this OpenID!"
 msgstr ""
 
@@ -2098,14 +2528,16 @@ msgid ""
 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:81 actions/invite.php:88 actions/invite.php:120
 msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2118,6 +2550,7 @@ msgid "You can create a new account to start posting notices."
 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 ""
@@ -2131,27 +2564,30 @@ 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."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: 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 ""
 
@@ -2169,15 +2605,16 @@ msgid ""
 msgstr ""
 
 #: ../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: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/invite.php:103 actions/invite.php:110
+#: ../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!"
@@ -2188,6 +2625,7 @@ 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 ""
 
@@ -2202,47 +2640,47 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992
+#: ../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:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002
+#: ../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: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: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: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:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr ""
 
@@ -2253,21 +2691,23 @@ 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/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/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 ""
 
@@ -2284,18 +2724,22 @@ msgstr ""
 #: 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:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr ""
 
-#: actions/disfavor.php:63
+#: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr ""
 
-#: actions/disfavor.php:72
+#: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
 msgstr ""
 
@@ -2303,16 +2747,18 @@ msgstr ""
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: actions/emailsettings.php:95
+#: 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: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
+#: classes/Command.php:132 actions/favor.php:86
+#: actions/twitapifavorites.php:125 classes/Command.php:152
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2321,86 +2767,91 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: actions/inbox.php:28
+#: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
 msgstr ""
 
-#: actions/inbox.php:30
+#: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 msgstr ""
 
-#: actions/inbox.php:53
+#: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: actions/invite.php:178
+#: 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/login.php:104
+#: 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:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: 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 ""
 
-#: actions/newmessage.php:65
+#: 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
+#: 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
+#: 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."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
 msgstr ""
 
-#: actions/openidsettings.php:28
+#: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: actions/openidsettings.php:46
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
@@ -2408,64 +2859,67 @@ msgstr ""
 msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: actions/openidsettings.php:87
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: actions/outbox.php:28
+#: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: actions/outbox.php:30
+#: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr ""
 
-#: actions/outbox.php:53
+#: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: actions/peoplesearch.php:28
+#: 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/profilesettings.php:27
+#: 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:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
 msgstr ""
 
-#: actions/recoverpassword.php:141
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: actions/recoverpassword.php:154
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
 msgstr ""
 
-#: actions/recoverpassword.php:169
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
 msgstr ""
 
-#: actions/recoverpassword.php:271
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
 msgstr ""
 
-#: actions/recoverpassword.php:327
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -2480,21 +2934,22 @@ msgstr ""
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: 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:61 actions/showfavorites.php:145
 #, php-format
 msgid "Feed for favorites of %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 ""
 
-#: actions/showmessage.php:33
+#: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
 msgstr ""
 
@@ -2502,12 +2957,12 @@ msgstr ""
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: actions/showmessage.php:61
+#: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: actions/showmessage.php:66
+#: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
@@ -2516,58 +2971,63 @@ msgstr ""
 msgid "Send a message"
 msgstr ""
 
-#: actions/smssettings.php:312
+#: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #, 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."
 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/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
 msgid "%s updates favorited by %s / %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 ""
 
 #: 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"
@@ -2579,15 +3039,15 @@ msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2595,7 +3055,7 @@ msgstr ""
 msgid "Twitter Username"
 msgstr ""
 
-#: actions/twittersettings.php:65
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgid "No spaces, please."
 msgstr ""
 
@@ -2603,15 +3063,15 @@ msgstr ""
 msgid "Twitter Password"
 msgstr ""
 
-#: actions/twittersettings.php:72
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: actions/twittersettings.php:75
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: actions/twittersettings.php:78
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
@@ -2621,7 +3081,7 @@ msgid ""
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -2631,160 +3091,166 @@ 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!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: 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: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:245 actions/twittersettings.php:461
 msgid "Twitter preferences saved."
 msgstr ""
 
-#: actions/userauthorization.php:84
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
 msgstr ""
 
-#: actions/userauthorization.php:324
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: actions/userauthorization.php:334
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:204
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:215
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39
+#: classes/Command.php:39 classes/Command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: classes/Command.php:96
+#: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: 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:146 classes/Command.php:166
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166
+#: classes/Command.php:166 classes/Command.php:189
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: classes/Command.php:169
+#: classes/Command.php:169 classes/Command.php:192
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
-#: classes/Command.php:172
+#: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
-#: classes/Command.php:175
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178
+#: classes/Command.php:178 classes/Command.php:201
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:228
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:300
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:307
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: 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:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: 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:313 classes/Command.php:356
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:358
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:379
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:381
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53
+#: classes/Message.php:53 classes/Message.php:56
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63
+#: classes/Message.php:63 classes/Message.php:66
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -2792,74 +3258,1476 @@ msgstr ""
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:289
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:508
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:512
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43
+#: 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:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: lib/personal.php:65
+#: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
 msgstr ""
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
 msgstr ""
 
-#: lib/personal.php:75
+#: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
 msgstr ""
 
-#: lib/personal.php:76
+#: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
 msgstr ""
 
-#: lib/personal.php:80
+#: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
 msgstr ""
 
-#: lib/personal.php:81
+#: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgid "To"
 msgstr ""
 
-#: scripts/maildaemon.php:45
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s e amigos"
+
+#: 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 ""
+
+#: 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
+#, php-format
+msgid "The address \"%s\" has been "
+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/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
+#, 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"
+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 ""
+
+#: 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 ""
+
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+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 "Bio é demasiada extensa (máx 140 car)."
+
+#: actions/editgroup.php:218
+msgid "Could not update group."
+msgstr ""
+
+#: actions/editgroup.php:226
+msgid "Options saved."
+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; "
+msgstr ""
+
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
+msgstr ""
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/emailsettings.php:321
+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 ""
+"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!"
+msgstr ""
+
+#: actions/facebookhome.php:196
+#, php-format
+msgid "If you would like the %s app to automatically update "
+msgstr ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, php-format
+msgid "Allow %s to update my Facebook status"
+msgstr ""
+
+#: actions/facebookhome.php:218
+msgid "Skip"
+msgstr ""
+
+#: actions/facebookhome.php:235
+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
+#, fuzzy
+msgid "Before"
+msgstr "Antes »"
+
+#: actions/facebookinvite.php:70
+#, 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:"
+msgstr ""
+
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
+msgstr ""
+
+#: actions/facebookinvite.php:105
+#, php-format
+msgid "Invite your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, 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."
+msgstr ""
+
+#: actions/facebooksettings.php:106
+msgid "Prefix"
+msgstr ""
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, 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
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.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
+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/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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Avatar actualizado."
+
+#: actions/grouplogo.php:450
+msgid "Failed updating logo."
+msgstr ""
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+msgstr ""
+
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+msgid "Create a new group"
+msgstr ""
+
+#: actions/groupsearch.php:57
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+msgstr ""
+
+#: actions/groupsearch.php:63
+msgid "Group search"
+msgstr ""
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
+msgstr ""
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+msgid "Send me replies through Jabber/GTalk "
+msgstr ""
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Código de confirmação não encontrado"
+
+#: 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 ""
+
+#: actions/joingroup.php:128
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr ""
+
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
+msgstr ""
+
+#: 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 ""
+
+#: actions/leavegroup.php:138
+#, php-format
+msgid "Could not remove user %s to group %s"
+msgstr ""
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: 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 ""
+
+#: 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/openidlogin.php:97
+msgid "OpenID login"
+msgstr ""
+
+#: actions/openidsettings.php:128
+msgid "Removing your only OpenID "
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Modificar a sua palavra-passe"
+
+#: actions/passwordsettings.php:89
+msgid "Password change"
+msgstr ""
+
+#: actions/peopletag.php:35
+#, 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 ""
+
+#: actions/peopletag.php:91
+#, 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"
+msgstr ""
+
+#: actions/profilesettings.php:144
+#, fuzzy
+msgid "Automatically subscribe to whoever "
+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\""
+msgstr ""
+
+#: actions/profilesettings.php:311
+msgid "Couldn't save tags."
+msgstr ""
+
+#: actions/public.php:107
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Mensagens públicas de %s"
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/public.php:220
+#, 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"
+msgstr ""
+
+#: actions/publictagcloud.php:63
+#, 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
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, "
+msgstr "1-64 letras ou números, sem pontuação ou espaços"
+
+#: 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
+#, fuzzy
+msgid " except this private data: password, "
+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%%%%. "
+msgstr ""
+
+#: 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 ""
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
+msgstr ""
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
+
+#: actions/showgroup.php:206
+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"
+msgstr ""
+
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+msgid "Note"
+msgstr ""
+
+#: actions/showgroup.php:270
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, php-format
+msgid "Notice feed for %s group"
+msgstr ""
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+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 ""
+
+#: actions/showgroup.php:370
+msgid "All members"
+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 "
+msgstr ""
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
+msgstr ""
+
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
+msgstr ""
+
+#: actions/showstream.php:143
+msgid "'s profile"
+msgstr ""
+
+#: actions/showstream.php:236 actions/tagother.php:77
+msgid "User profile"
+msgstr ""
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Todas as subscrições"
+
+#: actions/showstream.php:533
+msgid "All groups"
+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 "
+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; "
+msgstr ""
+
+#: actions/smssettings.php:335
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. "
+msgstr "A aguardar confirmação deste número de telefone."
+
+#: actions/smssettings.php:453
+msgid "Mobile carrier"
+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 ""
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr ""
+
+#: actions/subscribers.php:63
+msgid "These are the people who listen to "
+msgstr ""
+
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who "
+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"
+
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices "
+msgstr ""
+
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose "
+msgstr ""
+
+#: actions/subscriptions.php:122
+msgid "Jabber"
+msgstr ""
+
+#: actions/tag.php:43
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr ""
+
+#: actions/tag.php:66
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+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: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."
+msgstr ""
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:198
+msgid "Could not save tags."
+msgstr ""
+
+#: actions/tagother.php:233
+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
+#, php-format
+msgid "Microblog tagged with %s"
+msgstr ""
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+msgid "Not found."
+msgstr ""
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:126
+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
+#, 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 ""
+
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:71
+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 ""
+
+#: classes/Notice.php:104
+msgid "Problem saving notice. Unknown user."
+msgstr ""
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: 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
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "Sobre"
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "Modificar a sua palavra-passe"
+
+#: 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"
+msgstr ""
+
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Ligar conta existente"
+
+#: lib/action.php:341
+msgid "Login with OpenID"
+msgstr ""
+
+#: lib/action.php:344
+msgid "Help me!"
+msgstr ""
+
+#: lib/action.php:362
+msgid "Site notice"
+msgstr ""
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+msgid "Page notice"
+msgstr ""
+
+#: lib/action.php:562
+msgid "Secondary site navigation"
+msgstr ""
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+msgid "All "
+msgstr ""
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+msgid "Block this user"
+msgstr ""
+
+#: lib/blockform.php:153
+msgid "Block"
+msgstr "Bloquear"
+
+#: 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
+#, fuzzy
+msgid "Favor this notice"
+msgstr "Não é possível remover a mensagem."
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr ""
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
+
+#: lib/galleryaction.php:137
+msgid "Tag"
+msgstr ""
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+msgid "URL of the homepage or blog of the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Todas as subscrições"
+
+#: lib/groupeditform.php:153
+msgid "Describe the group or topic in 140 chars"
+msgstr ""
+
+#: lib/groupeditform.php:158
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+msgid "Logo"
+msgstr ""
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+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 "
+msgstr ""
+
+#: lib/joinform.php:114
+msgid "Join"
+msgstr ""
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr ""
+
+#: lib/logingroupnav.php:76
+msgid "Login with a username and password"
+msgstr ""
+
+#: lib/logingroupnav.php:79
+msgid "Sign up for a new account"
+msgstr ""
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
+
+#: lib/mail.php:254
+#, php-format
+msgid "Location: %s\n"
+msgstr ""
+
+#: lib/mail.php:256
+#, php-format
+msgid "Homepage: %s\n"
+msgstr ""
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+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/messageform.php:110
+msgid "Send a direct notice"
+msgstr ""
+
+#: lib/noticeform.php:125
+msgid "Send a notice"
+msgstr ""
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 ou mais caracteres"
+
+#: lib/noticelist.php:426
+msgid "in reply to"
+msgstr ""
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Não é possível remover a mensagem."
+
+#: lib/noticelist.php:451
+msgid "Reply"
+msgstr ""
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Não é possível remover a mensagem."
+
+#: lib/noticelist.php:474
+msgid "Delete"
+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/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr ""
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr ""
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
+msgstr ""
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90
+msgid "Popular"
+msgstr ""
+
+#: lib/searchgroupnav.php:82
+msgid "Notice"
+msgstr ""
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr ""
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, php-format
+msgid "People %s subscribes to"
+msgstr ""
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Já subscrito!."
+
+#: lib/subgroupnav.php:97
+#, 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 ""
+
+#: 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 ""
+
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr ""
+
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr ""
+
+#: lib/unblockform.php:120 lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr ""
+
+#: lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Desbloquear"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr ""
diff --git a/locale/pt_BR/LC_MESSAGES/laconica.mo b/locale/pt_BR/LC_MESSAGES/laconica.mo
index 562a91187..24add2245 100644
--- a/locale/pt_BR/LC_MESSAGES/laconica.mo
+++ b/locale/pt_BR/LC_MESSAGES/laconica.mo
diff --git a/locale/pt_BR/LC_MESSAGES/laconica.po b/locale/pt_BR/LC_MESSAGES/laconica.po
index 7c8b0d8e8..0edcf3f99 100644
--- a/locale/pt_BR/LC_MESSAGES/laconica.po
+++ b/locale/pt_BR/LC_MESSAGES/laconica.po
@@ -1,59 +1,45 @@
-# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Translation of Laconica to Brazilian Portuguese
+# Frederico Goncalves Guimaraes <frederico@teia.bio.br>, 2009.
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.po (laconica)  #-#-#-#-#\n"
 "Project-Id-Version: laconica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Acácio Alves dos Santos <acacioas@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Language: Portuguese\n"
-"X-Poedit-Country: BRAZIL\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-01-13 17:17-0200\n"
+"Last-Translator: Frederico Goncalves Guimaraes <frederico@teia.bio.br>\n"
+"Language-Team: Português do Brasil\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr "Pesquisar por \"%s\" no fluxo de mensagens"
+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."
+" 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 "
+" exceto estes dados privados: senha, endereço de e-mail, endereço de "
 "mensageiro instantâneo, número de telefone."
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
 msgid " from "
-msgstr " via "
+msgstr " de "
 
-#: ../actions/twitapistatuses.php:478
+#: ../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: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"
@@ -90,35 +76,35 @@ msgid ""
 msgstr ""
 "%1$s convidou você para se juntar ao %2$s (%3$s).\n"
 "\n"
-"%2$s é um serviço de micro-blogging the permite você se manter atualizado "
-"com as pessoas que você conhece e com as que interessam à você.\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, com pessoas que conhecem você. Também é ótimo "
-"para conhecer novas pessoas que compartilham os mesmos interesses que "
-"você.\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's no %2$s aqui:\n"
+"Você pode ver o perfil de %1$s no %2$s aqui:\n"
 "\n"
 "%5$s\n"
 "\n"
-"Se você quiser testar o serviço, clique no link abaixo para aceitar o "
+"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 "
+"Se não, você pode ignorar esta mensagem. Obrigado por sua paciência e seu "
 "tempo.\n"
-"\nAtenciosamente, %2$s\n"
+"\n"
+"Cordialmente, %2$s\n"
 
-#: ../lib/mail.php:124
+#: ../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. "
+msgstr "%1$s agora está acompanhando suas mensagens em %2$s."
 
 #: ../lib/mail.php:126
 #, php-format
@@ -134,52 +120,62 @@ msgstr ""
 "\n"
 "\t%3$s\n"
 "\n"
-"Atenciosamente,\n"
-"%4$s.\n "
+"Cordialmente,\n"
+"%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482
+#: ../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 "Atualizações de %1$s que respondem a mensagens de %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:45
+#: actions/shownotice.php:161
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Mensagem de %1$s em %2$s"
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
+#: ../actions/invite.php:84 ../actions/invite.php:92 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:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
 #, php-format
 msgid "%s Public Stream"
-msgstr "Conteúdo público de %s"
+msgstr "Fluxo público de %s"
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/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 e amigos"
 
-#: ../actions/twitapistatuses.php:49
+#: ../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:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
 msgid "%s status"
 msgstr "Status de %s"
 
-#: ../actions/twitapistatuses.php:338
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
 #, php-format
 msgid "%s timeline"
 msgstr "Mensagens de %s"
 
-#: ../actions/twitapistatuses.php:52
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s atualizações de todo mundo!"
@@ -189,82 +185,102 @@ 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.)"
+"(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: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%%). "
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** é um serviço de microblog disponibilizado por "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** é um serviço de microblogagem disponibilizado por [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259
+#: ../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 microblog."
+msgstr "**%%site.name%%** é um serviço de microblogagem. "
 
-#: ../lib/util.php:274
+#: ../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."
+". 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: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/password.php:42
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
-msgstr "6 ou mais caracteres"
+msgstr "6 caracteres ou mais"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
+#: actions/recoverpassword.php:220
 msgid "6 or more characters, and don't forget it!"
-msgstr "6 ou mais caracteres. E não se esqueça dela!"
+msgstr "6 caracteres ou mais. E não se esqueça dela!"
 
-#: ../actions/register.php:154
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
 msgid "6 or more characters. Required."
 msgstr "6 caracteres ou mais. Obrigatório."
 
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
-"Um código de confirmação foi enviado para o endereço de MI que você "
-"adicionou. Você deve permitir que %s envie mensagens para você."
+"Um código de confirmação foi enviado para o endereço de mensagem instantânea "
+"que você informou. Você deve permitir que %s envie mensagens para você."
 
-#: ../actions/emailsettings.php:213
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 "Um código de confirmação foi enviado para o endereço de e-mail que você "
-"informou. Verifique sua caixa de entrada (e de spam!) para o código e "
+"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: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 ""
-"Um código de confirmação foi enviado para o número de telefone de que "
-"você informou. Verifique sua caixa de entrada (e de spam!) para o código e "
+"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/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 "Método da API não encontrado!"
+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
@@ -275,197 +291,256 @@ msgstr "Método da API não encontrado!"
 #: ../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 "Método da API em construção."
+msgstr "O método da API está em construção."
 
-#: ../lib/util.php:324
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
 msgstr "Sobre"
 
-#: ../actions/userauthorization.php:119
+#: ../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:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "Adicionar OpenID"
 
-#: ../lib/settingsaction.php:97
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
-msgstr "Adicionar/Remover OpenIDs"
+msgstr "Adicionar ou remover OpenIDs"
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92
 msgid "Address"
 msgstr "Endereço"
 
-#: ../actions/invite.php:131
+#: ../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:273 actions/showstream.php:288
+#: actions/showstream.php:422
 msgid "All subscriptions"
 msgstr "Todas as assinaturas"
 
-#: ../actions/publicrss.php:64
+#: ../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/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, 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á autenticado."
 
-#: ../lib/subs.php:42
+#: ../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: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 apagar esta mensagem?"
+msgstr "Você tem certeza que deseja excluir esta mensagem?"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
+#: actions/userauthorization.php:81
 msgid "Authorize subscription"
-msgstr "Autorizar assinatura"
+msgstr "Autorizar a assinatura"
 
 #: ../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 no futuro sem pedir a senha. Não use em computadores "
+"Entrar automaticamente sem pedir a senha. Não use em computadores "
 "compartilhados!"
 
-#: ../actions/profilesettings.php:65
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Assinar automaticamente à quem me assinar (melhor para não humanos)"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#, fuzzy
+#: actions/profilesettings.php:34 actions/avatarsettings.php:65
+#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
 msgid "Avatar"
 msgstr "Avatar"
 
-#: ../actions/avatar.php:113
-#, fuzzy
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
-msgstr "O avatar foi atualizado"
+msgstr "O avatar foi atualizado."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"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?)"
+"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: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 confirmação deste endereço. Verifique sua caixa de entrada (e "
-"de spam!) para novas instruções."
+"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: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:1318 lib/util.php:1452
 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 "Descrição"
 
 #: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
+#: actions/register.php:89 actions/updateprofile.php:104
+#: 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:41 lib/deleteaction.php:69
 msgid "Can't delete this notice."
-msgstr "Não é possível apagar esta mensagem."
+msgstr "Não é possível excluir esta mensagem."
 
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
+#: actions/updateprofile.php:123
 #, php-format
-#, fuzzy
 msgid "Can't read avatar URL '%s'"
-msgstr "Não foi possível encontrar a imagem de exibição '%s'"
+msgstr "Não é possível ler a URL '%s' do avatar"
 
 #: ../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 foi possível salvar a nova senha."
+msgstr "Não é possível salvar a nova senha."
 
 #: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../lib/openid.php:121
+#: ../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"
+msgstr "Não foi possível instanciar um objeto do OpenID."
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
 msgid "Cannot normalize that Jabber ID"
-msgstr "Não foi possível configurar essa ID do Jabber"
+msgstr "Não foi possível normalizar essa ID do Jabber"
 
-#: ../actions/emailsettings.php:181
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
 msgid "Cannot normalize that email address"
-msgstr "Não é possível usar este endereço de email"
+msgstr "Não foi possível normalizar este endereço de e-mail"
 
-#: ../actions/password.php:45
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "Alterar"
 
-#: ../lib/settingsaction.php:88
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
 msgid "Change email handling"
-msgstr "Alterar tratamento de emails"
+msgstr "Configurações de uso do e-mail"
 
-#: ../actions/password.php:32
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Alterar a senha"
 
-#: ../lib/settingsaction.php:94
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
 msgid "Change your password"
-msgstr "Alterar sua senha"
+msgstr "Altera a sua senha"
 
-#: ../lib/settingsaction.php:85
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: lib/accountsettingsaction.php:105
 msgid "Change your profile settings"
-msgstr "Alterar suas configurações de perfil"
+msgstr "Alterar as suas configurações de perfil"
 
 #: ../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/confirmaddress.php:90
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
-msgstr "Confirmar o endereço"
+msgstr "Confirme o endereço"
 
 #: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "A confirmação foi cancelada."
 
-#: ../actions/smssettings.php:63
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
 msgid "Confirmation code"
 msgstr "Código de confirmação"
 
-#: ../actions/confirmaddress.php:38
+#: ../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."
 
@@ -487,14 +562,14 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"Parabéns, %s! E bem vindo a %%%%site.name%%%%. A partir de agora, você "
-"algumas opções...\n"
+"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 "
-"você possa publicar via mensageiro instantâneo.\n"
-"* [Pesquisar por pessoas](%%%%action.peoplesearch%%%%) que você conheça ou "
-"que tenha os mesmos interesses. \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 [preferências 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 "
@@ -502,339 +577,433 @@ msgstr ""
 "\n"
 "Obrigado por se cadastrar e esperamos que você aproveite o serviço."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "Conecta-se a uma conta já existente"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Contato"
 
-#: ../lib/openid.php:178
+#: ../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/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 "Não foi possível seguir o usuário: %s já está na sua lista."
+msgstr "Não é possível acompanhar o usuário: %s já está na sua lista."
 
-#: ../actions/twitapifriendships.php:53
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
 msgid "Could not follow user: User not found."
 msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
 
-#: ../lib/openid.php:160
+#: ../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: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: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:54 lib/subs.php:61 lib/subs.php:72
 msgid "Could not subscribe other to you."
-msgstr "Não é possível que outros o acompanhem."
+msgstr "Não é possível que outros o assinem."
 
-#: ../lib/subs.php:46
+#: ../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: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 email confirmado."
+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."
-msgstr "Não foi possível encontrar a página a partir da requisição feita."
+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 do email."
+msgstr "Não foi possível excluir a confirmação de e-mail."
 
-#: ../lib/subs.php:103
+#: ../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/twitapistatuses.php:93
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:84
 msgid "Couldn't find any statuses."
 msgstr "Não foi possível encontrar nenhum status."
 
-#: ../actions/remotesubscribe.php:127
+#: ../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 processar a requisição."
+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/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: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 os registros do usuário."
+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/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Criar"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "Criar uma nova conta"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../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/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
-msgstr "Endereço atual de Jabber/GTalk confirmado."
+msgstr "Endereço de Jabber/GTalk já confirmado."
 
-#: ../actions/smssettings.php:46
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
 msgid "Current confirmed SMS-enabled phone number."
-msgstr "Telefone atualmente habilitado para receber SMS."
+msgstr "Número de telefone já habilitado para receber SMS."
 
-#: ../actions/emailsettings.php:44
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+#: actions/emailsettings.php:99
 msgid "Current confirmed email address."
-msgstr "Endereço confirmado de e-mail."
+msgstr "Endereço de e-mail já confirmado."
 
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
 msgstr "Nesse momento"
 
-#: ../classes/Notice.php:72
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Erro no banco de dados durante a inserção da etiqueta: %s"
 
-#: ../lib/util.php:1061
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, 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:41
+#: actions/deletenotice.php:79
 msgid "Delete notice"
-msgstr "Excluir mensagem"
+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 você mesmo e seus interesses em 140 caracteres."
+msgstr "Descreva a si mesmo e seus interesses em 140 caracteres."
 
 #: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "E-mail"
 
-#: ../actions/emailsettings.php:59
+#: ../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:32
+#: actions/emailsettings.php:60
 msgid "Email Settings"
 msgstr "Configurações do e-mail"
 
-#: ../actions/register.php:73
+#: ../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: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:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
 msgid "Email address, like \"UserName@example.org\""
-msgstr "Endereço de email, ex: \"usuário@exemplo.org\""
+msgstr "Endereço de e-mail, ex: \"usuário@exemplo.org\""
 
-#: ../actions/invite.php:129
+#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
 msgid "Email addresses"
-msgstr "Endereço de email"
+msgstr "Endereços de e-mail"
 
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:231
 msgid "Enter a nickname or email address."
 msgstr "Informe um apelido ou endereço de e-mail."
 
-#: ../actions/smssettings.php:64
+#: ../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/userauthorization.php:137
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
+#: actions/userauthorization.php:161
 msgid "Error authorizing token"
 msgstr "Erro na autorização do token"
 
-#: ../actions/finishopenidlogin.php:253
+#: ../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/finishaddopenid.php:78
+#: ../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/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
 msgid "Error inserting avatar"
 msgstr "Erro na inserção do avatar"
 
 #: ../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/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/recoverpassword.php:240
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
 msgstr "Erro no salvamento do endereço de confirmação"
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
 msgid "Error saving remote profile"
 msgstr "Erro no salvamento do perfil remoto"
 
-#: ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving the profile."
 msgstr "Erro no salvamento do perfil."
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
 msgid "Error saving the user."
 msgstr "Erro no salvamento do usuário."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164
 msgid "Error saving user; invalid."
 msgstr "Erro no salvamento do usuário; inválido."
 
 #: ../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/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
 msgid "Error updating profile"
 msgstr "Erro na atualização do perfil"
 
 #: ../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/recoverpassword.php:80
+#: ../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/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
-msgstr "Esse apelido já existe"
+msgstr "Apelido já existente"
 
-#: ../lib/util.php:326
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "FAQ"
 
-#: ../actions/avatar.php:115
+#: ../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/all.php:61 ../actions/allrss.php:64
+#: ../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 "Mensagens dos amigos de %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
+#: actions/repliesrss.php:71
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Respostas de %s"
 
-#: ../actions/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Mensagens com a etiqueta %s"
 
-#: ../lib/searchaction.php:105
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
-msgstr "Pesquisar o conteúdo das mensagens"
+msgstr "Procurar no conteúdo das mensagens"
 
-#: ../lib/searchaction.php:101
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
-msgstr "Encontrar pessoas neste site"
+msgstr "Procurar 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."
+"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/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 muito longo (máx. 255 caracteres)"
+msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
 
-#: ../lib/util.php:322
+#: ../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: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 "Sítio de Internet"
+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 informada não é válida."
 
-#: ../actions/emailsettings.php:91
+#: ../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:102 lib/settingsaction.php:96
+#: lib/connectsettingsaction.php:104
 msgid "IM"
-msgstr "IM"
+msgstr "MI"
 
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
+#: actions/imsettings.php:118
 msgid "IM Address"
 msgstr "Endereço do mensageiro instantâneo"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
-msgstr "Configuração do mensageiro instantâneo"
+msgstr "Configurações do mensageiro instantâneo"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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."
@@ -855,151 +1024,188 @@ 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 ter uma nova enviada para "
-"o endereço de email informado em seu cadastro."
+"Se você esqueceu ou perdeu sua senha, você pode receber uma nova no endereço "
+"de e-mail informado em seu cadastro."
 
 #: ../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: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/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153
 msgid "Incorrect old password"
 msgstr "A senha antiga está incorreta"
 
-#: ../actions/login.php:67
+#: ../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)"
+msgstr "Nome de usuário e/ou senha incorreto(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 sua senha foram enviadas para o endereço de "
-"e-mail registrado no seu cadastro."
+"As instruções para recuperar a sua senha foram enviadas para o endereço de e-"
+"mail informado no seu cadastro."
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
-msgstr "A URL '%s' para a imagem de exibição é inválida"
+msgstr "A URL '%s' para o avatar é inválida"
 
-#: ../actions/invite.php:55
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
 #, php-format
 msgid "Invalid email address: %s"
-msgstr "Não é um endereço de email válido: %s"
+msgstr "Não é um endereço de e-mail válido: %s"
 
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "O site '%s' é inválido"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "A URL '%s' da licença é inválida"
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
 msgid "Invalid notice content"
 msgstr "O conteúdo da mensagem é inválido"
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72
 msgid "Invalid notice uri"
 msgstr "A URI da mensagem é inválida"
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "A URL da mensagem é inválida"
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
-msgstr "URL de perfil inválida '%s'."
+msgstr "A URL '%s' do perfil é inválida."
 
-#: ../actions/remotesubscribe.php:96
+#: ../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/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:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
-msgstr "Tamanho inválido"
+msgstr "Tamanho inválido."
 
 #: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: 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: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: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:306 lib/util.php:322 lib/facebookaction.php:207
+#: lib/subgroupnav.php:103
 msgid "Invite"
 msgstr "Convidar"
 
-#: ../actions/invite.php:123
+#: ../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:261 lib/util.php:277 lib/action.php:609
 #, php-format
 msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Ele funciona sob o software de microblog [Laconica](http://laconi.ca/), "
-"versão %s, disponível sob a [GNU Affero General Public License] "
-"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Ele funciona sob o software de microblogagem [Laconica](http://laconi.ca/), "
+"versão %s, disponível sob a [GNU Affero General Public License] (http://www."
+"fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: actions/imsettings.php:296
 msgid "Jabber ID already belongs to another user."
-msgstr "Este ID do Jabber já pertence à outro usuário."
+msgstr "Esta ID do Jabber já pertence à outro usuário."
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 "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."
+"certifique-se de adicionar %s à sua lista de contatos no seu cliente de "
+"mensagens instantâneas ou no GTalk."
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:128
 msgid "Language"
 msgstr "Idioma"
 
-#: ../actions/profilesettings.php:113
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:217
 msgid "Language is too long (max 50 chars)."
-msgstr "Nome do idioma muito extenso (máx. 50 caracteres)."
+msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
 
 #: ../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/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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 longa (máx. 255 caracteres)."
+msgstr "A localização é muito extensa (máx. 255 caracteres)."
 
 #: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
+#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
+#: 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 "Autenticação"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Autentique-se com uma conta [OpenID](%%doc.openid%%)."
@@ -1007,40 +1213,45 @@ msgstr "Autentique-se com uma conta [OpenID](%%doc.openid%%)."
 #: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
 "Autentique-se com seus nome de usuário e senha. Não tem um usuário ainda? "
-"[Registre](%%action.register%%) uma nova conta, ou use uma "
-"[OpenID](%%action.openidlogin%%)."
+"[Registre](%%action.register%%) uma nova conta, ou use uma [OpenID](%%action."
+"openidlogin%%)."
 
-#: ../lib/util.php:308
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Sair"
 
-#: ../actions/register.php:166
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:393
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome completo, de preferência seu nome \"real\""
 
-#: ../actions/login.php:110
+#: ../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/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 email para publicar e cancela o antigo."
+msgstr "Cria um novo endereço de e-mail para publicar e cancela o antigo."
 
-#: ../actions/emailsettings.php:27
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
-msgstr "Gerenciar como você recebe emails do %%site.name%%."
+msgstr "Configure o recebimento de e-mails do %%site.name%%."
 
-#: ../actions/showstream.php:300
+#: ../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:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog por %s"
@@ -1051,38 +1262,46 @@ 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óvel do seu celular. Se você conhece uma operadora que aceita "
-"SMS via e-mail, mas não está listada aqui, informe-nos enviando um e-mail "
-"para %s."
+"A operadora móvel do seu celular. Se você conhece uma operadora que aceita "
+"SMS via e-mail, mas não está listada aqui, informe-nos enviando uma "
+"mensagempara %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 "Meus textos e arquivos estão disponíveis sob"
+msgstr "Meus textos e arquivos estão disponíveis sob "
 
 #: ../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"
 
-#: ../lib/mail.php:144
+#: ../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 email para postar no %s"
+msgstr "Novo endereço de e-mail para publicar no %s"
 
-#: ../actions/emailsettings.php:297
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:465
 msgid "New incoming email address added."
 msgstr ""
-"Foi adicionado um novo endereço de e-mail para recebimento de "
-"mensagens."
+"Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
 
-#: ../actions/finishopenidlogin.php:71
+#: ../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: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"
 
@@ -1093,137 +1312,184 @@ msgstr ""
 "autenticado."
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
+#: 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/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
+#: 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 "Esse apelido já está em uso. Tente outro."
+msgstr "Este apelido já está em uso. Tente outro."
 
 #: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
 #: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: actions/finishopenidlogin.php: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 espaços."
+"O apelido deve conter apenas letras minúsculas e/ou números e não pode ter "
+"espaços."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
-msgstr "Esse apelido não é permitido."
+msgstr "Este apelido não é permitido."
 
-#: ../actions/remotesubscribe.php:72
+#: ../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"
+msgstr "Apelido do usuário que você quer acompanhar"
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "Apelido ou e-mail"
 
-#: ../actions/deletenotice.php:59
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
 msgid "No"
 msgstr "Não"
 
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
+#: actions/imsettings.php:279
 msgid "No Jabber ID."
 msgstr "Nenhuma ID de Jabber."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "Nenhum pedido de autorização!"
 
-#: ../actions/smssettings.php:181
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+#: actions/smssettings.php:299
 msgid "No carrier selected."
 msgstr "Não foi selecionada nenhuma operadora."
 
-#: ../actions/smssettings.php:316
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+#: actions/smssettings.php:486
 msgid "No code entered"
 msgstr "Não foi informado nenhum código"
 
-#: ../actions/confirmaddress.php:33
+#: ../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/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: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:32 actions/userbyid.php:70
 msgid "No id."
 msgstr "Nenhuma ID."
 
-#: ../actions/emailsettings.php:271
+#: ../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:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
-msgstr "Sem apelido."
+msgstr "Nenhum apelido."
 
 #: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: actions/emailsettings.php:363 actions/imsettings.php:345
+#: actions/smssettings.php:358
 msgid "No pending confirmation to cancel."
-msgstr "Nenhuma confirmação para cancelar."
+msgstr "Nenhuma confirmação pendente para cancelar."
 
-#: ../actions/smssettings.php:176
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+#: actions/smssettings.php:294
 msgid "No phone number."
 msgstr "Nenhum telefone cadastrado."
 
 #: ../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/recoverpassword.php:226
+#: ../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/userauthorization.php:49
+#: ../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/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 "Não foi encontrado nenhum resultado"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "Sem tamanho definido."
 
-#: ../actions/twitapistatuses.php:595
+#: ../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 status foi encontrado com esse ID."
+msgstr "Não foi encontrado nenhum status esse ID."
 
-#: ../actions/twitapistatuses.php:555
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
 msgid "No status with that ID found."
-msgstr "Nenhum status com esse ID foi encontrado."
+msgstr "Não foi encontrado nenhum status esse ID."
 
-#: ../actions/openidsettings.php:135
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
+#: actions/openidsettings.php:222
 msgid "No such OpenID."
 msgstr "Essa OpenID não existe."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "Esse documento não existe."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../lib/deleteaction.php:30 actions/shownotice.php:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
+#: lib/deleteaction.php:51
 msgid "No such notice."
 msgstr "Essa mensagem não existe."
 
-#: ../actions/recoverpassword.php:56
+#: ../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:56 actions/postnotice.php:57
+#: actions/postnotice.php:60
 msgid "No such subscription"
 msgstr "Essa assinatura não existe."
 
@@ -1233,213 +1499,296 @@ msgstr "Essa assinatura não existe."
 #: ../actions/replies.php:57 ../actions/repliesrss.php:35
 #: ../actions/showstream.php:110 ../actions/userbyid.php:36
 #: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
+#: actions/allrss.php:35 actions/avatarbynickname.php:43
+#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
+#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
+#: actions/replies.php:57 actions/repliesrss.php:35
+#: actions/showfavorites.php:34 actions/showstream.php:110
+#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
+#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
+#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
+#: lib/subs.php:33 lib/subs.php:95 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/recoverpassword.php:211
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+#: actions/recoverpassword.php:251
 msgid "No user with that email address or username."
-msgstr "Não foi encontrado um usuário com este login ou endereço de email."
+msgstr ""
+"Não foi encontrado nenhum usuário com essa identificação ou endereço de "
+"email."
 
-#: ../lib/gallery.php:80
+#: ../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: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: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: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:167 actions/imsettings.php:175
+#: actions/imsettings.php:290
 msgid "Not a valid Jabber ID"
 msgstr "Não é uma ID válida de Jabber"
 
-#: ../lib/openid.php:131
+#: ../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: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."
+msgstr "Não é um endereço de e-mail válido"
 
-#: ../actions/register.php:63
+#: ../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: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: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)."
 
-#: ../actions/remotesubscribe.php:104
+#: ../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/avatar.php:95
+#: ../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/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "Não autorizado."
 
 #: ../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/twitapistatuses.php:422
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:309
 msgid "Not found"
 msgstr "Não encontrado"
 
 #: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
 #: ../actions/newnotice.php:29 ../actions/subscribe.php:28
 #: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../lib/settingsaction.php:27 actions/disfavor.php:29 actions/favor.php:30
+#: actions/finishaddopenid.php:29 actions/logout.php:33
+#: actions/newmessage.php:28 actions/newnotice.php:29 actions/subscribe.php:28
+#: actions/unsubscribe.php:25 lib/deleteaction.php:38
+#: lib/settingsaction.php:27 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"
+msgstr "Você não está autenticado"
 
-#: ../lib/subs.php:91
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "Não é assinado!"
 
-#: ../actions/opensearch.php:35
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+#: actions/opensearch.php:67
 msgid "Notice Search"
-msgstr "Pesquisar por mensagem"
+msgstr "Procurar mensagem"
 
-#: ../actions/showstream.php:82
+#: ../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 "Mensagens de %s"
 
-#: ../actions/shownotice.php:39
+#: ../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/showstream.php:316
+#: ../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/tag.php:35 ../actions/tag.php:81
+#: ../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 "Feed de mensagens com %s"
+msgstr "Mensagens etiquetadas com %s"
 
-#: ../actions/password.php:39
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "Senha antiga"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../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: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: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/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 "Autenticar-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 autenticar via OpenID: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
-msgstr "Falha no OpenID: %s"
+msgstr "Falha na OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "Configurações da OpenID"
 
-#: ../actions/invite.php:135
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
 msgid "Optionally add a personal message to the invitation."
-msgstr "Opcionalmente adicione uma mensagem pessoal ao convite."
+msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite."
 
-#: ../actions/avatar.php:84
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "Envio parcial."
 
 #: ../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/recoverpassword.php:288
+#: ../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/recoverpassword.php:284
+#: ../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/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/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/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."
 
-#: ../lib/searchaction.php:100
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Pessoas"
 
-#: ../actions/opensearch.php:33
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#: actions/opensearch.php:64
 msgid "People Search"
-msgstr "Busca por pessoas"
+msgstr "Procurar pessoas"
 
-#: ../actions/peoplesearch.php:33
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Procurar pessoas"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "Pessoal"
 
-#: ../actions/invite.php:133
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
 msgid "Personal message"
 msgstr "Mensagem pessoal"
 
-#: ../actions/smssettings.php:69
+#: ../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"
 
@@ -1450,118 +1799,159 @@ msgid ""
 "click \"Cancel\"."
 msgstr ""
 "Por favor, verifique estes detalhes para ter certeza que você quer assinar "
-"as mensagens deste usuário. Se você não solicitou a assinatura das "
-"mensagens de ninguém, clique em \"Cancelar\"."
+"as mensagens deste usuário. Se você não solicitou a assinatura das mensagens "
+"de ninguém, clique em \"Cancelar\"."
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
+#: actions/imsettings.php:142
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Informar minhas mudanças de estado no Jabber/GTalk como uma mensagem."
+msgstr "Publicar uma mensagem quando eu mudar de estado no Jabber/GTalk."
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "Preferências"
 
 #: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: 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:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:129
 msgid "Preferred language"
-msgstr "Idioma"
+msgstr "Idioma preferencial"
 
-#: ../lib/util.php:328
+#: ../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:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
 msgid "Problem saving notice."
 msgstr "Problema no salvamento da mensagem."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "URL do Perfil"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
-msgstr "Configurações de perfil"
+msgstr "Configurações do perfil"
 
 #: ../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/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Fluxo de mensagens públicas"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "Mensagens públicas"
 
-#: ../actions/imsettings.php:79
+#: ../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 com meu Endereço de Jabber/Gtalk."
+msgstr "Publique um MicroID para meu endereço de Jabber/Gtalk."
 
-#: ../actions/emailsettings.php:94
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
 msgid "Publish a MicroID for my email address."
-msgstr "Publique um MicroID para meu endereço de email."
+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 actions/tag.php:75
+#: actions/tag.php:76
 msgid "Recent Tags"
-msgstr "Tags recentes"
+msgstr "Etiquetas recentes"
 
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr "Recuperar"
 
-#: ../actions/recoverpassword.php:156
+#: ../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:67
+#: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
-msgstr "Código de confirmação para usuário desconhecido."
+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/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
 msgid "Registration not allowed."
-msgstr "Cadastro não permitido."
+msgstr "Não é permitido o registro."
 
-#: ../actions/register.php:200
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
 msgid "Registration successful"
-msgstr "Registro completo"
+msgstr "Registro realizado com sucesso"
 
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "Recusar"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../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 minha autenticação nesse computador"
 
-#: ../actions/updateprofile.php:70
+#: ../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/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "Assinatura remota"
 
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
 #: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php: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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "Remover OpenID"
 
@@ -1571,70 +1961,92 @@ msgid ""
 "remove it, add another OpenID first."
 msgstr ""
 "Remover a sua única OpenID pode fazer com que seja impossível você se "
-"autenticar novamente! Se deseja realmente, adicione outra OpenID antes."
+"autenticar novamente! Se deseja realmente removê-la, adicione outra OpenID "
+"antes."
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
 msgid "Replies"
 msgstr "Respostas"
 
 #: ../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/recoverpassword.php:183
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "Restaurar"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "Restaurar a senha"
 
-#: ../lib/settingsaction.php:99
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
 msgid "SMS"
 msgstr "SMS"
 
-#: ../actions/smssettings.php:67
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
 msgid "SMS Phone number"
 msgstr "Telefone para SMS"
 
-#: ../actions/smssettings.php:33
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
 msgid "SMS Settings"
 msgstr "Configuração de SMS"
 
-#: ../lib/mail.php:219
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
 msgid "SMS confirmation"
 msgstr "Confirmação de SMS"
 
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
 msgid "Same as password above"
 msgstr "Igual à senha acima"
 
-#: ../actions/register.php:156
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:377
 msgid "Same as password above. Required."
-msgstr "Igual à senha acima. Obrigatório"
+msgstr "Igual à senha acima. Obrigatório."
 
 #: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
 #: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php: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"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/action.php:325
 msgid "Search"
-msgstr "Pesquisar"
+msgstr "Procurar"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
-msgstr "Pesquisar no fluxo de mensagens"
+msgstr "Procurar no fluxo de mensagens"
 
-#: ../actions/noticesearch.php:30
+#: ../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 ""
-"Pesquisar por mensagens em %%site.name%% por seu conteúdo. Separe os termos "
-"da busca com espaços; eles devem ter 3 caracteres ou mais."
+"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
 #, php-format
@@ -1642,193 +2054,245 @@ msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Pesquisar por pessoas em %%site.name%% por seus nomes, localidade ou "
+"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:296 actions/smssettings.php:304
+#: actions/smssettings.php:457
 msgid "Select a carrier"
-msgstr "Escolha uma operadora"
+msgstr "Selecione uma operadora"
 
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 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 para esse endereço para postar novas mensagens."
+msgstr "Envie e-mails para esse endereço para publicar novas mensagens."
 
-#: ../actions/emailsettings.php:88
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+#: actions/emailsettings.php:152
 msgid "Send me notices of new subscriptions through email."
-msgstr "Me envie as mensagens de novos seguidores via email."
+msgstr "Envie-me notificações de novos assinantes por e-mail."
 
-#: ../actions/imsettings.php:70
+#: ../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/smssettings.php:97
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
-"Me envie mensagens via SMS; Eu entendo que isso pode gerar contas "
-"exorbitantes de minha operadora."
+"Envie-me mensagens via SMS. Eu compreendo que isso pode gerar "
+"cobrançasexorbitantes da minha operadora."
 
-#: ../actions/imsettings.php:76
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"Me envie respostas através do Jabber/GTalk de pessoas que eu não estou "
-"seguindo."
+"Envie-me respostas de pessoas que eu não estou assinando através do Jabber/"
+"GTalk."
 
-#: ../lib/util.php:304
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr "Configurações"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "As configurações foram salvas."
 
-#: ../actions/tag.php:60
+#: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
-msgstr "Exibindo tags mais populares da última semana"
+msgstr "Exibindo as etiquetas mais populares da última semana"
 
-#: ../actions/finishaddopenid.php:66
+#: ../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/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..."
 
-#: ../scripts/maildaemon.php:58
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+#: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
-msgstr "Infelizmente não é permitido o recebimento de emails."
+msgstr "Desculpe-me, mas não é permitido o recebimento de emails."
 
-#: ../scripts/maildaemon.php:54
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+#: scripts/maildaemon.php:57
 msgid "Sorry, that is not your incoming email address."
-msgstr "Infelizmente este não é seu endeço para postagem via email."
+msgstr "Desculpe-me, mas este não é seu endereço de e-mail para publicação."
 
-#: ../lib/util.php:330
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
 msgid "Source"
 msgstr "Fonte"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "Estatísticas"
 
 #: ../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/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
+#: actions/remotesubscribe.php:113 actions/showstream.php:376
+#: lib/subscribeform.php:139
 msgid "Subscribe"
 msgstr "Assinar"
 
 #: ../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/userauthorization.php:310
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "A assinatura foi autorizada"
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "A assinatura foi recusada"
 
 #: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
+#: ../actions/subscriptions.php:27 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
+#: actions/showstream.php:407 actions/showstream.php:489
+#: lib/subgroupnav.php:80
 msgid "Subscriptions"
 msgstr "Assinaturas"
 
-#: ../actions/avatar.php:87
+#: ../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/tag.php:41 ../lib/util.php:301
+#: ../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"
+msgstr "Etiquetas"
 
-#: ../lib/searchaction.php:104
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
 msgid "Text"
 msgstr "Texto"
 
-#: ../actions/noticesearch.php:34
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:67
 msgid "Text search"
-msgstr "Pesquisa no conteúdo"
+msgstr "Procurar por texto"
 
-#: ../actions/openidsettings.php:140
+#: ../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/confirmaddress.php:52
+#: ../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/confirmaddress.php:43
+#: ../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/emailsettings.php:191
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
 msgid "That email address already belongs to another user."
-msgstr "Este endereço de email já pertence à outro usuário."
+msgstr "Esse endereço de e-mail já pertence à outro usuário."
 
-#: ../actions/avatar.php:80
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "Esse arquivo é muito grande."
 
-#: ../actions/imsettings.php:170
+#: ../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/emailsettings.php:188
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
 msgid "That is already your email address."
-msgstr "Este já é seu endereço de email."
+msgstr "Esse já é seu endereço de e-mail."
 
-#: ../actions/smssettings.php:188
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
 msgid "That is already your phone number."
-msgstr "Este já é seu número de telefone."
+msgstr "Esse já é seu número de telefone."
 
-#: ../actions/imsettings.php:233
+#: ../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/emailsettings.php:249
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:397
 msgid "That is not your email address."
-msgstr "Este não é seu endereço de email."
+msgstr "Esse não é seu endereço de email."
 
-#: ../actions/smssettings.php:257
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+#: actions/smssettings.php:393
 msgid "That is not your phone number."
-msgstr "Este não é seu número de telefone."
+msgstr "Esse não é seu número de telefone."
 
 #: ../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 "Esse endereço do comunicador instantâneo está incorreto."
+msgstr "Esse endereço de comunicador instantâneo está incorreto."
 
-#: ../actions/smssettings.php:233
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+#: actions/smssettings.php:362
 msgid "That is the wrong confirmation number."
 msgstr "O código de confirmação informado está incorreto."
 
-#: ../actions/smssettings.php:191
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+#: actions/smssettings.php:309
 msgid "That phone number already belongs to another user."
-msgstr "Este número de telefone já pertence à outro usuário."
+msgstr "Esse número de telefone já pertence à outro usuário."
 
 #: ../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/twitapiaccount.php:74
+#: ../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 longo.. O tamanho máximo é de 255 caracteres."
+msgstr "Está muito extenso. O tamanho máximo é de 255 caracteres."
 
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "O endereço \"%s\" foi confirmado para sua conta."
 
 #: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413
 msgid "The address was removed."
 msgstr "O endereço foi removido."
 
@@ -1838,9 +2302,9 @@ msgid ""
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"A assinatura foi autorizada, mas não foi informada nenhuma URL de retorno "
-"válida. Verifique as instruções do site para detalhes sobre como "
-"autorizar a assinatura. Seu código de assinatura é:"
+"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 ""
@@ -1848,121 +2312,141 @@ msgid ""
 "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 "
-"válida. Verifique as instruções do site para maiores detalhes em como "
-"rejeitar completamente a assinatura."
+"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 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/subscribers.php:33
+#: ../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/subscriptions.php:35
+#: ../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/subscriptions.php:33
+#: ../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/invite.php:89
+#: ../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ários e você está automaticamente seguindo a "
+"These people are already users and you were automatically subscribed to them:"
+msgstr "Estas pessoas já são usuárias e você as assinou automaticamente:"
 
 #: ../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 comece de novo."
+msgstr "Este código de confirmação é muito antigo. Por favor inicie novamente."
 
 #: ../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 formulário deve enviar-se automaticamente. Caso isso não ocorra, "
-"clique no botão \"Enviar\" para ir para seu provedor de OpenID."
+"Este formulário deve enviar-se automaticamente. Caso isso não ocorra, clique "
+"no botão \"Enviar\" para ir para seu provedor de OpenID."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../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 é 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."
+"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 POST ou DELETE."
 
 #: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
+#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
+#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
+#: actions/twitapistatuses.php:303 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."
 
-#: ../lib/util.php:164
+#: ../lib/util.php:164 lib/util.php:246
 msgid "This page is not available in a media type you accept"
 msgstr "Esta página não está disponível em um tipo de mídia que você aceita"
 
-#: ../actions/profilesettings.php:63
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138
 msgid "Timezone"
 msgstr "Fuso horário"
 
-#: ../actions/profilesettings.php:107
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
 msgid "Timezone not selected."
-msgstr "Fuso horário não selecionado."
+msgstr "O fuso horário não foi selecionado."
 
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
-"Para assinar, você pode [autenticar-se](%%action.login%%), ou "
-"[registrar](%%action.register%%) uma nova conta. Se você já tem uma conta "
-"em um [site de microblog compatível](%%doc.openmublog%%),  informe a URL do "
-"seu perfil abaixo."
+"Para assinar, você pode [autenticar-se](%%action.login%%), ou [registrar](%%"
+"action.register%%) uma nova conta. Se você já tem uma conta em um [site de "
+"microblogagem compatível](%%doc.openmublog%%), informe a URL do seu perfil "
+"abaixo."
 
-#: ../actions/twitapifriendships.php:163
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:132
 msgid "Two user ids or screen_names must be supplied."
-msgstr "Dois usuários com IDs ou logins devem ser informados."
+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 para seu site, blog ou perfil em outro site"
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
+#: actions/remotesubscribe.php:110
 msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL para seu perfil em outro serviço de microblog compatível"
+msgstr "URL para seu perfil em outro serviço de microblogagem compatível"
 
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
 #: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: 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/recoverpassword.php:276
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323
 msgid "Unexpected password reset."
-msgstr "Restauração inesperada de senha."
+msgstr "Restauração inesperada da senha."
 
-#: ../index.php:57
+#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
 msgid "Unknown action"
 msgstr "Ação desconhecida"
 
 #: ../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."
 
-#: ../lib/util.php:269
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1970,42 +2454,52 @@ msgstr ""
 "Caso não seja especificado, os colaboradores deste site possuem direito "
 "autoral sobre seu conteúdo e ele está disponível sob"
 
-#: ../actions/confirmaddress.php:48
+#: ../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: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/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: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:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
 msgid "Updates by instant messenger (IM)"
-msgstr "Atualizações via mensageiro instantâneo (IM)"
+msgstr "Atualizações via mensageiro instantâneo (MI)"
 
-#: ../actions/twitapistatuses.php:241
+#: ../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/twitapistatuses.php:341
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Atualizações de %1$s no %2$s!"
 
-#: ../actions/avatar.php:68
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/avatarsettings.php:162 actions/grouplogo.php:232
 msgid "Upload"
 msgstr "Enviar"
 
@@ -2016,28 +2510,29 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Envie um novo avatar (imagem do usuário) aqui. Você não poderá editar a "
-"imagem depois que enviar, então certifique-se que o formato dela esteja "
-"mais ou menos quadrado. Ela deve estar sob a mesma licença também. Use uma "
+"Envie um novo \"avatar\" (imagem do usuário) aqui. Você não poderá editar a "
+"imagem depois que enviar, então certifique-se que o formato dela esteja mais "
+"ou menos quadrado. Ela deve estar sob a mesma licença do site. Use uma "
 "imagem que pertença a você e que você queira compartilhar."
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
-msgstr "Envie uma nova imagem de exibição"
+msgstr "Envie uma nova imagem para o seu perfil"
 
-#: ../actions/invite.php:114
+#: ../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."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 "Use esse formulário para convidar seus amigos e colegas para usar este "
 "serviço."
 
 #: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php: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/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."
 
@@ -2045,66 +2540,88 @@ msgstr "O usuário que está está sendo acompanhado não existe."
 #: ../actions/foaf.php:47 ../actions/replies.php:41
 #: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
 #: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/twitapiusers.php:82 actions/all.php:41
+#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
+#: actions/showfavorites.php:41 actions/showstream.php:44
+#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
+#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
+#: actions/twitapiusers.php:87 lib/mailbox.php:50
+#: 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/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "Apelido do usuário"
 
-#: ../actions/twitapiusers.php:75
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
 msgid "User not found."
 msgstr "Usuário não encontrado."
 
-#: ../actions/profilesettings.php:63
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
 msgid "What timezone are you normally in?"
-msgstr "Que fuso horário você normalmente está?"
+msgstr "Em que fuso horário você normalmente está?"
 
-#: ../lib/util.php:1159
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
 msgstr "E aí, %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 "Onde você está, ex: \"cidade, estado, país\""
+msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipo de imagem errado para '%s'"
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Tamanho da imagem errado 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"
 
-#: ../actions/finishaddopenid.php:64
+#: ../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/deletenotice.php:37
+#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
 msgid ""
 "You are about to permanently delete a notice.  Once this is done, it cannot "
 "be undone."
 msgstr ""
-"Você está prestes a apagar permanentemente uma mensagem. Uma vez feito, "
-"não poderá ser desfeito."
+"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:31
+#: actions/recoverpassword.php:36
 msgid "You are already logged in!"
 msgstr "Você já está autenticado!"
 
-#: ../actions/invite.php:81
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
 msgid "You are already subscribed to these users:"
-msgstr "Você já segue à esses usuários:"
+msgstr "Você já está assinando esses usuários:"
 
-#: ../actions/twitapifriendships.php:128
+#: ../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."
 
@@ -2112,50 +2629,54 @@ msgstr "Você não é amigo do usuário especificado."
 msgid "You can change your password here. Choose a good one!"
 msgstr "Você pode alterar sua senha aqui. Faça uma boa escolha!"
 
-#: ../actions/register.php:135
+#: ../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/smssettings.php:28
+#: ../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 "Você pode receber mensagens SMS do %%site.name%% através de email."
+msgstr "Você pode receber mensagens SMS do %%site.name%% através de e-mail."
 
 #: ../actions/openidsettings.php:86
 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\"."
+"Você pode remover uma OpenID da sua conta, clicando no botão \"Remover\"."
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"Você pode enviar e receber mensagens através dos [mensageiros "
-"instantâneos](%%doc.im%%) Jabber/GTalk. Configure seu endereço e opções "
-"abaixo."
+"Você pode enviar e receber mensagens através dos [mensageiros instantâneos](%"
+"%doc.im%%) Jabber/GTalk. Configure seu endereço e opções abaixo."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 "Você pode atualizar suas informações pessoais aqui, para que as pessoas "
 "saibam mais sobre você."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: 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/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/updateprofile.php:63
+#: ../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"
 
@@ -2171,42 +2692,46 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s"
 msgstr ""
-"Você tem um novo endereço para postagem no %1$s.\n"
+"Você tem um novo endereço para publicação no %1$s.\n"
 "\n"
-"Envie emails para %2$s a fim de postar novas mensagens.\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"
+"Atenciosamente,\n"
+"%4$s"
 
-#: ../actions/twitapistatuses.php:612
+#: ../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: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 o %s"
+msgstr ""
+"Você deve estar autenticado para convidar outros usuários para usar o %s"
 
-#: ../actions/invite.php:103
+#: ../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 ""
-"Você será notificado qunando seus convidados aceitarem o convite e se "
+"Você será notificado assim que seus convidados aceitarem o convite e se "
 "registrarem neste site. Obrigado por aumentar a comunidade!"
 
 #: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Você foi identificado. Informe uma nova senha abaixo."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "Sua URL de OpenID"
 
 #: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
-msgstr "Seu apelido neste servidor, ou seu email registrado."
+msgstr "Seu apelido neste servidor, ou seu e-mail registrado."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -2217,73 +2742,78 @@ 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:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "a poucos segundos atrás"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "aproximadamente %d dias atrás"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "aproximadamente %d horas atrás"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr "aproximadamente %d minutos atrás"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr "aproximadamente %d meses atrás"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "aproximadamente um dia atrás"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "aproximadamente um minuto atrás"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
-msgstr "aproximadamente um mes atrás"
+msgstr "aproximadamente um mês atrás"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "aproximadamente um ano atrás"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "aproximadamente uma hora atrás"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
 msgid "delete"
-msgstr "apagar"
+msgstr "excluir"
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../lib/stream.php:117 actions/noticesearch.php:136
+#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
 msgid "in reply to..."
 msgstr "em resposta à..."
 
 #: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "responder"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "igual à senha acima"
 
-#: ../actions/twitapistatuses.php:755
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:555
 msgid "unsupported file type"
-msgstr "Formato de imagem não suportado"
+msgstr "tipo de arquivo não suportado"
 
-#: ../lib/util.php:1309
+#: ../lib/util.php:1309 lib/util.php:1443
 msgid "« After"
 msgstr "« Depois"
 
@@ -2296,190 +2826,218 @@ msgstr "« Depois"
 #: 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 ""
+"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
 
-#: actions/disfavor.php:55
+#: actions/disfavor.php:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
-msgstr ""
+msgstr "Essa mensagem não é uma favorita!"
 
-#: actions/disfavor.php:63
+#: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
-msgstr ""
+msgstr "Não foi possível excluir a favorita."
 
-#: actions/disfavor.php:72
+#: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
-msgstr ""
+msgstr "Tornar favorita"
 
 #: actions/emailsettings.php:92
 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/emailsettings.php:95
+#: actions/emailsettings.php:95 actions/emailsettings.php:163
 msgid "Send me email when someone sends me a private message."
-msgstr ""
+msgstr "Envie-me um e-mail quando alguém enviar-me uma mensagem particular."
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
+#: actions/twitapifavorites.php:118
 msgid "This notice is already a favorite!"
-msgstr ""
+msgstr "Essa mensagem já é favorita!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:86
+#: actions/twitapifavorites.php:125 classes/Command.php:152
 msgid "Could not create favorite."
-msgstr ""
+msgstr "Não foi possível criar a favorita."
 
 #: actions/favor.php:70
 msgid "Disfavor"
-msgstr ""
+msgstr "Eliminar favorita"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
 msgid "%s favorite notices"
-msgstr ""
+msgstr "Mensagens favoritas de %s"
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
-msgstr ""
+msgstr "Mensagens favoritas de %s"
 
-#: actions/inbox.php:28
+#: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
-msgstr ""
+msgstr "Recebidas por %s - pág. %d"
 
-#: actions/inbox.php:30
+#: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
-msgstr ""
+msgstr "Recebidas por %s"
 
-#: actions/inbox.php:53
+#: actions/inbox.php:53 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/invite.php:178
+#: 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 convidou você para se associar a %2$s (%3$s).\n"
+"\n"
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
+#: actions/register.php:416
 msgid "Automatically login in the future; "
-msgstr ""
+msgstr "Autenticar-se automaticamente no futuro; "
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
-msgstr ""
+msgstr "Por questões de segurança, por favor, redigite seu "
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:268
 msgid "Login with your username and password. "
-msgstr ""
+msgstr "Autentique-se com o seu nome de usuário e senha. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/twitapidirect_messages.php:141
 msgid "That's too long. Max message size is 140 chars."
-msgstr ""
+msgstr "Muito extenso. O tamanho máximo das mensagens é 140 caracteres."
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:128
 msgid "No recipient specified."
-msgstr ""
+msgstr "Nenhum destinatário especificado."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:131
+#: actions/newmessage.php:168 classes/Command.php:237
 msgid "You can't send a message to this user."
-msgstr ""
+msgstr "Você não pode enviar uma mensagem para esse usuário."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: 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."
+"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/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
 msgid "No such user"
-msgstr ""
+msgstr "Esse usuário não existe"
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "New message"
-msgstr ""
+msgstr "Nova mensagem"
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
-msgstr ""
+msgstr "Mensagem sem um perfil correspondente"
 
-#: actions/openidsettings.php:28
+#: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
+"A [OpenID](%%doc.openid%%) permite que você autentique-se em vários sites"
 
-#: actions/openidsettings.php:46
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
-msgstr ""
+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 ""
+msgstr "Será impossível autenticar-se caso você remova a sua única OpenID! "
 
-#: actions/openidsettings.php:87
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
-msgstr ""
+msgstr "Você pode remover uma OpenID da sua conta "
 
-#: actions/outbox.php:28
+#: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
-msgstr ""
+msgstr "Enviadas por %s - pág. %d"
 
-#: actions/outbox.php:30
+#: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
-msgstr ""
+msgstr "Envidas por %s"
 
-#: actions/outbox.php:53
+#: 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/peoplesearch.php:28
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
+"Procurar por pessoas no %%site.name%% pelo seu nome, localização ou "
+"interesses. "
 
-#: actions/profilesettings.php:27
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
 msgid "You can update your personal profile info here "
-msgstr ""
+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 ""
+msgstr "Usuário sem um perfil correspondente"
 
-#: actions/recoverpassword.php:91
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
-msgstr ""
+msgstr "Esse código de confirmação é muito antigo. "
 
-#: actions/recoverpassword.php:141
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
-msgstr ""
+msgstr "Se você perdeu ou esqueceu a sua"
 
-#: actions/recoverpassword.php:154
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
-msgstr ""
+msgstr "Você foi identificado. Digite uma"
 
-#: actions/recoverpassword.php:169
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
-msgstr ""
+msgstr "Seu apelido nesse servidor, "
 
-#: actions/recoverpassword.php:271
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
-msgstr ""
+msgstr "Instruções para recuperar a sua senha "
 
-#: actions/recoverpassword.php:327
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
-msgstr ""
+msgstr "A nova senha foi salva com sucesso. "
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
-msgstr ""
+msgstr "A senha deve ter 6 ou mais caracteres."
 
 #: actions/register.php:216
 #, php-format
@@ -2487,391 +3045,2002 @@ msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 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 ""
+msgstr "(Você receberá uma mensagem por e-mail a qualquer momento, com "
 
-#: actions/remotesubscribe.php:51
+#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
 #, php-format
 msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
+msgstr "Para assinar, você pode [autenticar-se](%%action.login%%),"
 
-#: actions/showfavorites.php:61
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
 #, php-format
 msgid "Feed for favorites of %s"
-msgstr ""
+msgstr "Mensagens 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 ""
+msgstr "Não foi possível recuperar as mensagens favoritas."
 
-#: actions/showmessage.php:33
+#: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
-msgstr ""
+msgstr "Essa mensagem não existe."
 
 #: actions/showmessage.php:42
 msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "Apenas o remetente e o destinatário podem ler essa mensagem."
 
-#: actions/showmessage.php:61
+#: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "Mensagem para %1$s no %2$s"
 
-#: actions/showmessage.php:66
+#: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "Mensagem de %1$s no %2$s"
 
 #: actions/showstream.php:154
 msgid "Send a message"
-msgstr ""
+msgstr "Enviar uma mensagem"
 
-#: actions/smssettings.php:312
+#: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
-msgstr ""
+msgstr "Operadora móvel do seu celular. "
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #, php-format
 msgid "Direct messages to %s"
-msgstr ""
+msgstr "Mensagem direta para %s"
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
 msgid "All the direct messages sent to %s"
-msgstr ""
+msgstr "Todas as mensagens diretas enviadas para %s"
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
 msgid "Direct Messages You've Sent"
-msgstr ""
+msgstr "Mensagens diretas que você enviou"
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #, php-format
 msgid "All the direct messages sent from %s"
-msgstr ""
+msgstr "Todas as mensagens diretas enviadas por %s"
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
 msgid "No message text!"
-msgstr ""
+msgstr "Nenhuma mensagem de texto!"
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
 msgid "Recipient user not found."
-msgstr ""
+msgstr "O usuário destinatário não foi encontrado."
 
 #: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:153
 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."
 
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #, php-format
 msgid "%s / Favorites from %s"
-msgstr ""
+msgstr "%s / Favoritas de %s"
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
 msgid "%s updates favorited by %s / %s."
-msgstr ""
+msgstr "%s updates favorited by %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:164 lib/mail.php:553
 #, php-format
 msgid "%s added your notice as a favorite"
-msgstr ""
+msgstr "%s marcara(m) sua mensagem como favorita"
 
 #: 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 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, "
 msgstr ""
+"Adicione a sua conta do Twitter para enviar suas mensagens para lá "
+"automaticamente, "
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
-msgstr ""
+msgstr "Configurações do Twitter"
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
-msgstr ""
+msgstr "Conta do Twitter"
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
-msgstr ""
+msgstr "Conta do Twitter já verificada."
 
 #: actions/twittersettings.php:63
 msgid "Twitter Username"
-msgstr ""
+msgstr "Nome de usuário do Twitter"
 
-#: actions/twittersettings.php:65
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgid "No spaces, please."
-msgstr ""
+msgstr "Sem espaços, por favor."
 
 #: actions/twittersettings.php:67
 msgid "Twitter Password"
-msgstr ""
+msgstr "Senha do Twitter"
 
-#: actions/twittersettings.php:72
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
-msgstr ""
+msgstr "Enviar minhas mensagens para o Twitter automaticamente."
 
-#: actions/twittersettings.php:75
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Send local \"@\" replies to Twitter."
-msgstr ""
+msgstr "Enviar respostas \"@\" locais para o Twitter."
 
-#: actions/twittersettings.php:78
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Subscribe to my Twitter friends here."
-msgstr ""
+msgstr "Assinar meus amigos do Twitter aqui."
 
 #: actions/twittersettings.php:122
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 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:128 actions/twittersettings.php:334
 msgid "Could not verify your Twitter credentials!"
-msgstr ""
+msgstr "Não foi possível verificar suas credenciais no Twitter!"
 
 #: actions/twittersettings.php:137
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
+msgstr "Não foi possível obter as informações da conta \"%s\" no Twitter."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
 msgid "Unable to save your Twitter settings!"
-msgstr ""
+msgstr "Não foi possível salvar suas configurações do Twitter!"
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
 msgid "Twitter settings saved."
-msgstr ""
+msgstr "As configurações do Twitter foram salvas."
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:395
 msgid "That is not your Twitter account."
-msgstr ""
+msgstr "Essa não é a sua conta no Twitter."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
 msgid "Couldn't remove Twitter user."
-msgstr ""
+msgstr "Não foi possível remover o usuário do Twitter."
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
 msgid "Twitter account removed."
-msgstr ""
+msgstr "A conta do Twitter foi removida."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:428 actions/twittersettings.php:439
+#: actions/twittersettings.php:453
 msgid "Couldn't save Twitter preferences."
-msgstr ""
+msgstr "Não foi possível salvar as preferências do Twitter."
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
 msgid "Twitter preferences saved."
-msgstr ""
+msgstr "As preferências do Twitter foram salvas."
 
-#: actions/userauthorization.php:84
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
-msgstr ""
+msgstr "Por favor, verifique estes detalhes para ter certeza que "
 
-#: actions/userauthorization.php:324
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
-msgstr ""
+msgstr "A assinatura foi autorizada "
 
-#: actions/userauthorization.php:334
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
-msgstr ""
+msgstr "A assinatura foi recusada, mas não "
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
 msgid "Command results"
-msgstr ""
+msgstr "Resultados do comando"
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:204
 msgid "Command complete"
-msgstr ""
+msgstr "O comando foi completado"
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:215
 msgid "Command failed"
-msgstr ""
+msgstr "O comando falhou"
 
-#: classes/Command.php:39
+#: classes/Command.php:39 classes/Command.php:44
 msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Desculpe, mas esse comando ainda não foi implementado."
 
-#: classes/Command.php:96
+#: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
-msgstr ""
+msgstr "Assinaturas: %1$s\n"
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
 msgid "User has no last notice"
-msgstr ""
+msgstr "O usuário não tem uma \"última mensagem\""
 
-#: classes/Command.php:146
+#: classes/Command.php:146 classes/Command.php:166
 msgid "Notice marked as fave."
-msgstr ""
+msgstr "Mensagem marcada como favorita."
 
-#: classes/Command.php:166
+#: classes/Command.php:166 classes/Command.php:189
 #, php-format
 msgid "%1$s (%2$s)"
-msgstr ""
+msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169
+#: classes/Command.php:169 classes/Command.php:192
 #, php-format
 msgid "Fullname: %s"
-msgstr ""
+msgstr "Nome completo: %s"
 
-#: classes/Command.php:172
+#: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
-msgstr ""
+msgstr "Localização: %s"
 
-#: classes/Command.php:175
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
 msgid "Homepage: %s"
-msgstr ""
+msgstr "Site: %s"
 
-#: classes/Command.php:178
+#: classes/Command.php:178 classes/Command.php:201
 #, php-format
 msgid "About: %s"
-msgstr ""
+msgstr "Sobre: %s"
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:228
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
+"A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d"
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
-msgstr ""
+msgstr "A mensagem direta para %s foi enviada"
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
-msgstr ""
+msgstr "Ocorreu um erro durante o envio da mensagem direta."
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:300
 msgid "Specify the name of the user to subscribe to"
-msgstr ""
+msgstr "Especifique o nome do usuário que será assinado"
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:307
 #, php-format
 msgid "Subscribed to %s"
-msgstr ""
+msgstr "Efetuada a assinatura de %s"
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:328
 msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+msgstr "Especifique o nome do usuário que deixará de ser assinado"
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "Cancelada a assinatura de %s"
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
+#: classes/Command.php:376
 msgid "Command not yet implemented."
-msgstr ""
+msgstr "O comando não foi implementado ainda."
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:356
 msgid "Notification off."
-msgstr ""
+msgstr "Notificação desligada."
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:358
 msgid "Can't turn off notification."
-msgstr ""
+msgstr "Não é possível desligar a notificação"
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:379
 msgid "Notification on."
-msgstr ""
+msgstr "Notificação ligada."
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:381
 msgid "Can't turn on notification."
-msgstr ""
+msgstr "Não é possível ligar a notificação."
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
-msgstr ""
+msgstr "Comandos:\n"
 
-#: classes/Message.php:53
+#: classes/Message.php:53 classes/Message.php:56
 msgid "Could not insert message."
-msgstr ""
+msgstr "Não foi possível inserir a mensagem."
 
-#: classes/Message.php:63
+#: classes/Message.php:63 classes/Message.php:66
 msgid "Could not update message with new URI."
-msgstr ""
+msgstr "Não foi possível atualizar a mensagem com a nova URI."
 
 #: lib/gallery.php:46
 msgid "User without matching profile in system."
-msgstr ""
+msgstr "Usuário sem um perfil correspondente no sistema."
 
-#: lib/mail.php:147
+#: 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"
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:508
 #, php-format
 msgid "New private message from %s"
-msgstr ""
+msgstr "Nova mensagem particular de %s"
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:512
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
 msgstr ""
+"%1$s (%2$s) enviou uma mensagem particular para você:\n"
+"\n"
 
-#: lib/mailbox.php:43
+#: lib/mailbox.php:43 lib/mailbox.php:89
 msgid "Only the user can read their own mailboxes."
-msgstr ""
+msgstr "As caixas postais são legíveis somente pelo seu próprio usuário."
 
-#: lib/openid.php:195
+#: lib/openid.php:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
-msgstr ""
+msgstr "Este formulário deve enviar-se automaticamente. "
 
-#: lib/personal.php:65
+#: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
-msgstr ""
+msgstr "Favoritas"
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
-msgstr ""
+msgstr "Mensagens favoritas de %s"
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
-#: lib/personal.php:75
+#: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
-msgstr ""
+msgstr "Recebidas"
 
-#: lib/personal.php:76
+#: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
-msgstr ""
+msgstr "Suas mensagens recebidas"
 
-#: lib/personal.php:80
+#: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
-msgstr ""
+msgstr "Enviadas"
 
-#: lib/personal.php:81
+#: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
-msgstr ""
+msgstr "Suas mensagens enviadas"
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
-msgstr ""
+msgstr "Opções de integração com o Twitter"
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgid "To"
-msgstr ""
+msgstr "Para"
 
-#: scripts/maildaemon.php:45
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "Could not parse message."
+msgstr "Não foi possível analisar a mensagem."
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s e amigos"
+
+#: actions/avatarsettings.php:76
+#, fuzzy
+msgid "You can upload your personal avatar."
+msgstr "Você pode atualizar as informações do seu perfil pessoal aqui "
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Configurações do Twitter"
+
+#: 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
+#, fuzzy
+msgid "There was a problem with your session token. "
+msgstr ""
+"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
+
+#: 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
+#, fuzzy
+msgid "Lost our file."
+msgstr "Não foi possível bloquear o usuário."
+
+#: 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 arquivo não suportado"
+
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Não foi especificado nenhum perfil."
+
+#: 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/block.php:111
+msgid "Block user"
+msgstr "Bloquear usuário"
+
+#: 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/block.php:162
+msgid "You have already blocked this user."
+msgstr "Você já bloqueou esse usuário."
+
+#: actions/block.php:167
+msgid "Failed to save block information."
+msgstr "Não foi possível salvar a informação de bloqueio."
+
+#: actions/confirmaddress.php:159
+#, fuzzy, php-format
+msgid "The address \"%s\" has been "
+msgstr "O endereço foi removido."
+
+#: actions/deletenotice.php:73
+#, fuzzy
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+"Você está prestes a apagar permanentemente uma mensagem. Isso não poderá ser "
+"desfeito."
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Adicionar às favoritas"
+
+#: actions/editgroup.php:54
+#, 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"
+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 ""
+"Você deve estar autenticado para convidar outros usuários para usar o %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 "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
+#, fuzzy
+msgid "No such group"
+msgstr "Esse usuário não existe"
+
+#: actions/editgroup.php:106 actions/editgroup.php:165
+#: actions/grouplogo.php:107
+#, fuzzy
+msgid "You must be an admin to edit the group"
+msgstr ""
+"Você deve estar autenticado para convidar outros usuários para usar o %s"
+
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
+msgstr ""
+
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
+msgstr ""
+"O apelido deve conter apenas letras minúsculas e/ou números e não pode ter "
+"espaços."
+
+#: actions/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "Descrição muito extensa (máximo 140 caracteres)."
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Não foi possível atualizar o usuário."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "As configurações foram salvas."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Aguardando a confirmação deste número de telefone."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#, fuzzy
+msgid "Make a new email address for posting to; "
+msgstr "Novo endereço de e-mail para publicar no %s"
+
+#: actions/emailsettings.php:157
+#, fuzzy
+msgid "Send me email when someone "
+msgstr "Envie-me um e-mail quando alguém enviar-me uma mensagem particular."
+
+#: 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
+#, fuzzy
+msgid "That email address already belongs "
+msgstr "Esse endereço de e-mail já pertence à outro usuário."
+
+#: actions/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
+msgstr ""
+"Um código de confirmação foi enviado para o endereço de mensagem instantânea "
+"que você informou. Você deve permitir que %s envie mensagens para você."
+
+#: 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 ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, 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 "Nenhum conteúdo!"
+
+#: 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
+#, fuzzy
+msgid "After"
+msgstr "« Depois"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#, fuzzy
+msgid "Before"
+msgstr "Antes »"
+
+#: actions/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:72
+#, fuzzy
+msgid "Invitations have been sent to the following users:"
+msgstr "Convite(s) enviado(s) para as seguintes pessoas:"
+
+#: actions/facebookinvite.php:96
+#, fuzzy, php-format
+msgid "You have been invited to %s"
+msgstr "Você teve a atenção chamada por %s"
+
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "Mensagens dos amigos de %s"
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
+msgstr ""
+
+#: actions/facebookremove.php:56
+msgid "Couldn't remove Facebook user."
+msgstr "Não foi possível remover o usuário do Facebook."
+
+#: actions/facebooksettings.php:65
+#, fuzzy
+msgid "There was a problem saving your sync preferences!"
+msgstr ""
+"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
+
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "As preferências foram salvas."
+
+#: actions/facebooksettings.php:90
+#, fuzzy
+msgid "Automatically update my Facebook status with my notices."
+msgstr "Enviar minhas mensagens para o Twitter automaticamente."
+
+#: actions/facebooksettings.php:97
+#, fuzzy
+msgid "Send \"@\" replies to Facebook."
+msgstr "Enviar respostas \"@\" locais para o Twitter."
+
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Perfil"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
+msgstr ""
+
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Preferências"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Excluir a favorita"
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+msgid "Popular notices"
+msgstr "Mensagens populares"
+
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Mensagens populares"
+
+#: actions/favorited.php:79
+#, fuzzy
+msgid "The most popular notices on the site right now."
+msgstr "Exibindo as etiquetas mais populares da última semana"
+
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
+msgstr "Usuários de destaque"
+
+#: actions/featured.php:71
+#, fuzzy, php-format
+msgid "Featured users, page %d"
+msgstr "Usuários de destaque"
+
+#: actions/featured.php:99
+#, 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 "Esse usuário bloqueou o seu pedido de assinatura."
+
+#: actions/groupbyid.php:79
+msgid "No ID"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "Logo updated."
+msgstr "O avatar foi atualizado."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Não foi possível atualizar o avatar."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+msgstr ""
+
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#, fuzzy
+msgid "Create a new group"
+msgstr "Criar uma nova conta"
+
+#: actions/groupsearch.php:57
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+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, "
+msgstr ""
+
+#: actions/imsettings.php:147
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk "
+msgstr "Envie-me as mensagens via Jabber/GTalk."
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Nenhum código de confirmação."
+
+#: 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/joingroup.php:95
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Você já está assinando esses usuários:"
+
+#: 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/joingroup.php:135
+#, fuzzy, php-format
+msgid "%s joined group %s"
+msgstr "%s / Favoritas de %s"
+
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
+msgstr ""
+
+#: actions/leavegroup.php:65
+#, fuzzy
+msgid "You must be logged in to leave a group."
+msgstr ""
+"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."
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
+msgstr ""
+
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Nenhum status atual"
+
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr ""
+
+#: 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
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+"Esse usuário não permite ser chamado à atenção ou ainda não confirmou ou "
+"configurou seu e-mail."
+
+#: 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/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "Autenticar-se via OpenID"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Remover OpenID"
+
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Outras configurações"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Gerenciar várias outras opções."
+
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr "Encolhimento automático de URL"
+
+#: actions/othersettings.php:112
+msgid "Service"
+msgstr "Serviço"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr "Serviço de encolhimento automático a ser utilizado."
+
+#: 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/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Altera a sua senha"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "A senha foi salva."
+
+#: actions/peopletag.php:35
+#, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Não é uma etiqueta de pessoa válida: %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/peopletag.php:91
+#, 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"
+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
+#, 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."
+
+#: actions/public.php:107
+#, 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."
+
+#: actions/public.php:220
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+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
+#, 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 "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/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/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/register.php:398
+#, fuzzy
+msgid "URL of your homepage, blog, "
+msgstr "URL para seu site, blog ou perfil em outro site"
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Descreva a si mesmo e seus interesses em 140 caracteres."
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+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%%%%. "
+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:79
+#, fuzzy, php-format
+msgid "%s favorite notices, page %d"
+msgstr "Mensagens favoritas de %s"
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
+
+#: actions/showgroup.php:206
+#, 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
+msgid "URL"
+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 "Mensagens"
+
+#: actions/showgroup.php:270
+#, fuzzy
+msgid "Group actions"
+msgstr "Outras opções"
+
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Mensagens de %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, 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
+#: lib/tagcloudsection.php:71
+#, fuzzy
+msgid "(None)"
+msgstr "(nenhum)"
+
+#: actions/showgroup.php:370
+msgid "All members"
+msgstr ""
+
+#: actions/showgroup.php:378
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+"Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/"
+"wiki/Microblogging)"
+
+#: actions/showmessage.php:98
+#, fuzzy
+msgid "Only the sender and recipient "
+msgstr "Apenas o remetente e o destinatário podem ler essa mensagem."
+
+#: actions/showstream.php:73
+#, 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:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "O usuário não tem perfil."
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+#, fuzzy
+msgid "User actions"
+msgstr "Outras opções"
+
+#: 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:343
+#, fuzzy
+msgid "Message"
+msgstr "Nova mensagem"
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Assinantes"
+
+#: actions/showstream.php:533
+msgid "All groups"
+msgstr ""
+
+#: actions/showstream.php:542
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+"Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/"
+"wiki/Microblogging)"
+
+#: actions/smssettings.php:128
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, "
+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:335
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. "
+msgstr "Aguardando a confirmação deste número de telefone."
+
+#: actions/smssettings.php:453
+#, fuzzy
+msgid "Mobile carrier"
+msgstr "Selecione uma operadora"
+
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+msgstr "Você não está assinando esse perfil."
+
+#: actions/subedit.php:83
+msgid "Could not save subscription."
+msgstr "Não foi possível salvar a assinatura."
+
+#: actions/subscribe.php:55
+msgid "Not a local user."
+msgstr "Não é um usuário local."
+
+#: actions/subscribe.php:69
+msgid "Subscribed"
+msgstr "Assinado"
+
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Assinantes"
+
+#: actions/subscribers.php:52
+#, php-format
+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."
+
+#: actions/subscribers.php:67
+#, fuzzy, php-format
+msgid "These are the people who "
+msgstr "Estas são as pessoas que acompanham as mensagens de %s."
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Todas as assinaturas"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Todas as assinaturas"
+
+#: actions/subscriptions.php:65
+#, fuzzy
+msgid "These are the people whose notices "
+msgstr "Estas são as pessoas cujas mensagens %s acompanha."
+
+#: actions/subscriptions.php:69
+#, fuzzy, php-format
+msgid "These are the people whose "
+msgstr "Estas são as pessoas que acompanham as mensagens de %s."
+
+#: actions/subscriptions.php:122
+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/tagother.php:33
+msgid "Not logged in"
+msgstr "Você não está autenticado"
+
+#: actions/tagother.php:39
+msgid "No id argument."
+msgstr "Nenhum argumento de ID."
+
+#: actions/tagother.php:65
+#, fuzzy, php-format
+msgid "Tag %s"
+msgstr "Etiquetas"
+
+#: actions/tagother.php:141
+#, fuzzy
+msgid "Tag user"
+msgstr "Etiquetas"
+
+#: actions/tagother.php:149
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+"Etiquetas desse usuário (letras, números, -, ., e _), separadas por vírgulas "
+"ou espaços"
+
+#: actions/tagother.php:164
+#, fuzzy
+msgid "There was a problem with your session token."
+msgstr ""
+"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
+
+#: actions/tagother.php:191
+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
+msgid "Could not save tags."
+msgstr "Não foi possível salvar as etiquetas."
+
+#: actions/tagother.php:233
+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/tagrss.php:35
+msgid "No such tag."
+msgstr "Essa etiqueta não existe."
+
+#: actions/tagrss.php:66
+#, php-format
+msgid "Microblog tagged with %s"
+msgstr "Microblogs etiquetados com %s"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr "Não foi possível bloquear o usuário."
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr "Não foi possível desbloquear o usuário."
+
+#: actions/twitapiusers.php:48
+msgid "Not found."
+msgstr "Não encontrado."
+
+#: actions/twittersettings.php:71
+#, fuzzy
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+"Adicione a sua conta do Twitter para enviar suas mensagens para lá "
+"automaticamente, "
+
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
+msgstr "Nome de usuário do Twitter"
+
+#: actions/twittersettings.php:126
+msgid "Twitter password"
+msgstr "Senha do Twitter"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
+msgstr "Amigos do Twitter"
+
+#: 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 "Não foi possível obter as informações da conta \"%s\" no Twitter."
+
+#: actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Erro na remoção do bloqueio."
+
+#: actions/unsubscribe.php:50
+msgid "No profile id in request."
+msgstr "Nenhuma ID de perfil na requisição."
+
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
+msgstr "Nenhum perfil com essa ID."
+
+#: actions/unsubscribe.php:71
+msgid "Unsubscribed"
+msgstr "Cancelado"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
+msgstr ""
+
+#: classes/Notice.php:104
+msgid "Problem saving notice. Unknown user."
+msgstr "Problema no salvamento da mensagem. Usuário desconhecido."
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+"Muitas mensagens rapidamente; dê uma respirada e publique novamente em "
+"alguns minutos."
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr "Você foi banido de publicar mensagens nesse site."
+
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Não foi possível atualizar o avatar."
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr "Outras"
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr "Outras opções"
+
+#: lib/action.php:130
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "Sobre"
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "Altera a sua senha"
+
+#: 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"
+msgstr ""
+
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Criar uma nova conta"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "Essa OpenID não existe."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Ajuda"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "Nova mensagem"
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "Nova mensagem"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Navegação pelas assinaturas"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+#, fuzzy
+msgid "All "
+msgstr "Todas"
+
+#: lib/action.php:635
+msgid "license."
 msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Bloquear usuário"
+
+#: lib/blockform.php:153
+msgid "Block"
+msgstr "Bloquear"
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "Mensagens favoritas de %s"
+
+#: 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 "Criar uma nova conta"
+
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#, fuzzy
+msgid "Published"
+msgstr "Público"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
+msgid "Favor this notice"
+msgstr "Mensagens favoritas de %s"
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr "Filtrar etiquetas"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr "Todas"
+
+#: lib/galleryaction.php:137
+msgid "Tag"
+msgstr "Etiqueta"
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr "Selecione uma etiqueta para diminuir a lista"
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr "Ir"
+
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "URL para seu site, blog ou perfil em outro site"
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Assinaturas"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Descreva a si mesmo e seus interesses em 140 caracteres."
+
+#: lib/groupeditform.php:158
+#, fuzzy
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Sair"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+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
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Esta página não está disponível em um tipo de mídia que você aceita"
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Autenticação"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Salvar"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Autentique-se com o seu nome de usuário e senha. "
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Criar uma nova conta"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s agora está acompanhando suas mensagens em %2$s."
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Localização: %s"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Site: %s"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr "Você teve a atenção chamada por %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) quer saber com você está atualmente e está convidando-o a "
+"publicar alguma notícia.\n"
+"\n"
+
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr ""
+"%1$s acabou de marcar sua mensagem de %2$s como uma favorita.\n"
+"\n"
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+#, fuzzy
+msgid "From"
+msgstr " de "
+
+#: lib/messageform.php:110
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Excluir a mensagem"
+
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "Chamar a atenção"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 caracteres ou mais"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "em resposta à..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Não é possível excluir esta mensagem."
+
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "responder"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Excluir a mensagem"
+
+#: lib/noticelist.php:474
+#, fuzzy
+msgid "Delete"
+msgstr "excluir"
+
+#: lib/nudgeform.php:116
+#, fuzzy
+msgid "Nudge this user"
+msgstr "Chamada de atenção enviada"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Nudge"
+msgstr "Chamada de atenção enviada"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "Você não pode enviar uma mensagem para esse usuário."
+
+#: lib/personaltagcloudsection.php:56
+#, fuzzy, php-format
+msgid "Tags in %s's notices"
+msgstr "O usuário não tem uma \"última mensagem\""
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr "(nenhum)"
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Público"
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
+msgstr "Etiquetas recentes"
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr "Destaque"
+
+#: lib/publicgroupnav.php:90
+msgid "Popular"
+msgstr "Popular"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Mensagens"
+
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "Procurar por pessoas neste site"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Assinatura remota"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Efetuada a assinatura de %s"
+
+#: lib/subgroupnav.php:97
+#, 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"
+msgstr ""
+"Use esse formulário para convidar seus amigos e colegas para usar este "
+"serviço."
+
+#: lib/subs.php:53
+msgid "User has blocked you."
+msgstr "O usuário bloqueou você."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Efetuada a assinatura de %s"
+
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+msgstr "Não"
+
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr ""
+
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "Bloquear usuário"
+
+#: lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Desbloquear"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+#, fuzzy
+msgid "Unsubscribe from this user"
+msgstr "Cancelada a assinatura de %s"
+
+#~ msgid "Code not yet ready."
+#~ msgstr "O código ainda não está pronto."
+
+#~ msgid "Export and delete your user information."
+#~ msgstr "Exportar e excluir as informações do seu usuário."
+
+#~ msgid "Delete my account"
+#~ msgstr "Excluir a minha conta"
+
+#~ msgid "Delete my account confirmation"
+#~ msgstr "Confirmação de exclusão da minha conta"
+
+#~ msgid "Check if you are sure you want to delete your account."
+#~ msgstr "Verifique se você deseja realmente excluir sua conta."
+
+#~ msgid "Showing recently popular notices"
+#~ msgstr "Exibir as mensagens populares recentes"
+
+#~ msgid "Tag a person"
+#~ msgstr "Etiquetar uma pessoa"
+
+#~ msgid "List"
+#~ msgstr "Lista"
+
+#~ msgid "Icons"
+#~ msgstr "�cones"
+
+#~ 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"
diff --git a/locale/ru_RU/LC_MESSAGES/laconica.mo b/locale/ru_RU/LC_MESSAGES/laconica.mo
index 1adc55b88..cbf1cc141 100644
--- a/locale/ru_RU/LC_MESSAGES/laconica.mo
+++ b/locale/ru_RU/LC_MESSAGES/laconica.mo
diff --git a/locale/ru_RU/LC_MESSAGES/laconica.po b/locale/ru_RU/LC_MESSAGES/laconica.po
index fc08785b7..e7e6f85a1 100644
--- a/locale/ru_RU/LC_MESSAGES/laconica.po
+++ b/locale/ru_RU/LC_MESSAGES/laconica.po
@@ -4,55 +4,47 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.po (0.6)  #-#-#-#-#\n"
-"Project-Id-Version: 0.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Doktor Bro <admin@stosorok.com>\n"
-"Language-Team: Doktor Bro <info@stosorok.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-01-16 10:34+0000\n"
+"Last-Translator: Sergey Salnikov <salnsg>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr ""
+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."
+" 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 ""
+msgstr "%1$s / Обновлены ответы дл� %2$s"
 
-#: ../actions/invite.php:168
+#: ../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"
@@ -87,26 +79,37 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
-"%1$s приглашает теб� запи�ать�� на %2$s "
-"(%3$s).\n"
+"%1$s приглашает теб� запи�ать�� на %2$s (%3$s).\n"
 "\n"
-"%2$s — �то открытый �ерви�, который "
-"позвол�ет быть в кур�е по�ледних �обытий "
-"из жизни людей, которых ты знаешь или "
-"которые теб� интере�уют.\n"
+"%2$s — �то открытый �ерви�, который позвол�ет быть в кур�е по�ледних �обытий "
+"из жизни людей, которых ты знаешь или которые теб� интере�уют.\n"
 "\n"
-"Ты также можешь ра��казывать другим о "
-"�ебе: о твоих делах, мы�л�х и "
-"впечатлени�х. У на� ты �можешь заве�ти "
-"новые знаком�тва � людьми, которые "
+"Ты также можешь ра��казывать другим о �ебе: о твоих делах, мы�л�х и "
+"впечатлени�х. У на� ты �можешь заве�ти новые знаком�тва � людьми, которые "
 "раздел�ют твои интере�ы.\n"
 "\n"
-"%1$s �казал(а):\n\n%4$s\n\nПрофиль %1$s на %2$s можно по�мотреть зде�ь:\n\n%5$s\n\nЕ�ли ты хочешь попробовать наш �ерви�, нажми на нижнюю ��ылку, чтобы прин�ть приглашение.\n\n%6$s\n\nЕ�ли нет, про�то проигнорируй �то пи�ьмо. Спа�ибо за твоё терпение и врем�.\n\nС уважением,\n%2$s\n"
+"%1$s �казал(а):\n"
+"\n"
+"%4$s\n"
+"\n"
+"Профиль %1$s на %2$s можно по�мотреть зде�ь:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Е�ли ты хочешь попробовать наш �ерви�, нажми на нижнюю ��ылку, чтобы прин�ть "
+"приглашение.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Е�ли нет, про�то проигнорируй �то пи�ьмо. Спа�ибо за твоё терпение и врем�.\n"
+"\n"
+"С уважением,\n"
+"%2$s\n"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+msgstr "%1$s теперь про�матривает твои запи�и на %2$s."
 
 #: ../lib/mail.php:126
 #, php-format
@@ -122,117 +125,144 @@ msgstr ""
 "\n"
 "\t%3$s\n"
 "\n"
-"С уважением,\n%4$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 ""
+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 ""
+msgstr "%1$s �тату� на %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
+#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
 #, php-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
 #, php-format
 msgid "%s Public Stream"
-msgstr ""
+msgstr "%s Публичный поток"
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
+#: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
+#: 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/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33
 #, php-format
 msgid "%s public timeline"
-msgstr ""
+msgstr "%s публична� хронологи�"
 
-#: ../lib/mail.php:206 lib/mail.php:212
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
 msgid "%s status"
-msgstr ""
+msgstr "%s �тату�"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
 #, php-format
 msgid "%s timeline"
-msgstr ""
+msgstr "%s хронологи�"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
 #, php-format
 msgid "%s updates from everyone!"
-msgstr ""
+msgstr "%s обновлен полно�тью!"
 
 #: ../actions/register.php:213
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
+"(Вам �разу же по�лано �ообщение по �лектронной почте, � ин�трукци�ми по "
+"тому, как подтвердить �вой �лектронный адре�.)"
 
-#: ../lib/util.php:257 lib/util.php:273
+#: ../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%%). "
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
+"**%%site.name%%** �то �ерви� микроблогинга доведённый до Ва� при помощи [%%"
+"site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
-msgstr ""
+msgstr "**%%site.name%%** - �ерви� микроблогинга. "
 
 #: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
-msgstr ""
+msgstr ". Создатель определ�ет�� по полному имени или нику."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
+#: lib/groupeditform.php:139
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 латин�ких �трочных букв или цифр, без "
+msgstr "1-64 латин�ких �трочных букв или цифр, без пробелов"
 
-#: ../actions/register.php:152
+#: ../actions/register.php:152 actions/register.php:166
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
-"1-64 латин�ких �трочных букв или цифр, без "
-"пробелов и знаков препинани�. Об�зательно."
+"1-64 латин�ких �трочных букв или цифр, без пробелов. Об�зательное поле."
 
-#: ../actions/password.php:42
+#: ../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 ""
+msgstr "6 или более �имволов, и не забывайте его!"
 
-#: ../actions/register.php:154
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
 msgid "6 or more characters. Required."
-msgstr "6 или больше букв. Об�зательно."
+msgstr "6 или более �имволов. Об�зательное поле."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
+"Код подтверждени� вы�лан на Ваш IM-адре�, который Вы добавили. Вы должны "
+"подтвердить %s дл� ра��ылки �ообщений Вам."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
+"Код подтверждени� вы�лан на �лектронный адре�, который Вы добавили. "
+"Про�мотрите Вашу �лектронный почтовый �щик (и папку дл� �пама тоже!) дл� "
+"нахождени� �того кода и ин�трукций по его и�пользованию."
 
 #: ../actions/smssettings.php:216 actions/smssettings.php:224
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your inbox "
 "(and spam box!) for the code and instructions on how to use it."
 msgstr ""
+"Код подверждени� вы�лан на мобильный номер, который вы добавили.  По�мотрите "
+"Ваши вход�щие �ообщени� (и папку дл� �пама тоже!) дл� нахождени� �того кода "
+"и ин�трукций по его и�пользованию."
 
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -244,9 +274,17 @@ msgstr ""
 #: 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/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 ""
+msgstr "API-метод не найден!"
 
 #: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
 #: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
@@ -262,88 +300,116 @@ msgstr ""
 #: 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/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 ""
+msgstr "API-метод рекон�труирует��"
 
-#: ../lib/util.php:324
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
 msgstr "О проекте"
 
-#: ../actions/userauthorization.php:119
+#: ../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 ""
+msgstr "Добавить OpenID"
 
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
-msgstr ""
+msgstr "Добавить или удалить OpenID"
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/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: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:273 actions/showstream.php:288
+#: actions/showstream.php:422
 msgid "All subscriptions"
-msgstr "В�е подпи�ки"
+msgstr "В�е подпи�ки."
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
 #, php-format
 msgid "All updates for %s"
-msgstr ""
+msgstr "В�е обновлени� дл� %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, php-format
 msgid "All updates matching search term \"%s\""
-msgstr ""
+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 ""
+msgstr "Уже авторизован."
 
-#: ../lib/subs.php:42 lib/subs.php:42
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
-msgstr ""
+msgstr "Уже подпи�ан!"
 
-#: ../actions/deletenotice.php:54
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+#: actions/deletenotice.php:113
 msgid "Are you sure you want to delete this notice?"
-msgstr "Ты точно хочешь удалить �ту заметку?"
+msgstr "Вы уверены, что хотите удалить �ту заметку?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
+#: actions/userauthorization.php:81
 msgid "Authorize subscription"
-msgstr ""
+msgstr "�вторизованна� подпи�ка"
 
 #: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
-msgstr "В �ледующий раз зайти автоматиче�ки. �е дл� обще�твенных компьютеров!"
+msgstr "�втоматиче�ка� повторна� авторизаци�. �е дл� публичных компьютеров!"
 
-#: ../actions/profilesettings.php:65
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr "�втоматиче�ки подпи�ывать�� на в�ех, кто "
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+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/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "�ватар обновлён."
 
@@ -353,106 +419,135 @@ 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: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 ""
+msgstr "В ожидании подтверждени� данного номера телефона."
 
-#: ../lib/util.php:1318
+#: ../lib/util.php:1318 lib/util.php:1452
+#, fuzzy
 msgid "Before »"
-msgstr "Предыдущие »"
+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 "Интере�ы"
+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 ""
+msgstr "Слишком длинна� биографи� (не более 140 �имволов)."
 
-#: ../lib/deleteaction.php:41
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
 msgid "Can't delete this notice."
-msgstr "Заметка не удал�ет��."
+msgstr "�е удаёт�� удалить �ту заметку."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
+#: actions/updateprofile.php:123
 #, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr ""
+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 ""
+msgstr "�е удаёт�� �охранить новый пароль."
 
 #: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: 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:121 lib/openid.php:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
+msgstr "�е удаёт�� подтвердить OpenID."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
 msgid "Cannot normalize that Jabber ID"
-msgstr ""
+msgstr "�е удаёт�� �тандартизировать �тот Jabber ID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
 msgid "Cannot normalize that email address"
-msgstr ""
+msgstr "�е удаёт�� �тандартизировать �тот �лектронный адре�"
 
-#: ../actions/password.php:45
+#: ../actions/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"
-msgstr ""
+msgstr "Изменить �лектронный адре�"
 
-#: ../actions/password.php:32
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: ../lib/settingsaction.php:94
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
 msgid "Change your password"
-msgstr "Изменить пароль"
+msgstr "Изменить Ваш пароль"
 
-#: ../lib/settingsaction.php:85
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: lib/accountsettingsaction.php:105
 msgid "Change your profile settings"
-msgstr "�а�тройки профил�"
+msgstr "�а�тройки Ваших у�тановок профил�"
 
 #: ../actions/password.php:43 ../actions/recoverpassword.php:181
 #: ../actions/register.php:155 ../actions/smssettings.php:65
+#: 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: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 ""
+msgstr "Подтверждение отменено."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
 msgid "Confirmation code"
-msgstr ""
+msgstr "Код подтверждени�"
 
 #: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
-msgstr ""
+msgstr "Код подтверждени� не найден."
 
 #: ../actions/register.php:202
 #, php-format
@@ -472,107 +567,135 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-
-#: ../actions/finishopenidlogin.php:91
+"�аши поздравлени�, %s! И добро пожаловать на %%site.name%%%%. Зде�ь Вы "
+"можете ...\n"
+"* Перейти на [your profile](%s) и запо�тить Ваше первое �ообщение.* Добавить "
+"Ваш [Jabber/GTalk - адре�](%%%%action.imsettings%%%%) так что Вы �можете "
+"по�ле �того отправл�ть по�ты через ме��енджеры.* [И�кать людей](%%%%action."
+"peoplesearch%%%%) который вы возможно знаете или � которыми раздел�ете одни "
+"и те же интере�ы. * Обновить Ваши [профильные у�тановки](%%%%action."
+"profilesettings%%%%) чтобы больше ра��казать другим о �ебе. * Прочитать "
+"[онлайн-документацию](%%%%doc.help%%%%) чтобы узнать об о�обенно�т�х данного "
+"�ерви�а. Спа�ибо за то, что при�оединили�ь к нам и надеем��, что вы получите "
+"удоволь�твие от и�пользовани� данного �ерви�а!"
+
+#: ../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 ""
+msgstr "Соединить � �уще�твующей запи�ью"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
-msgstr "Св�зь"
+msgstr "Контактна� информаци�"
 
-#: ../lib/openid.php:178 lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
-msgstr ""
+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
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr ""
+msgstr "�е удает�� включить %s в �пи�ок поддержки, он уже в Вашем �пи�ке."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
 msgid "Could not follow user: User not found."
 msgstr ""
+"�е удаёт�� �ледовать пользователю, т.к. такого пользовател� не �уще�твует."
 
-#: ../lib/openid.php:160 lib/openid.php:160
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
 #, php-format
 msgid "Could not redirect to server: %s"
-msgstr ""
+msgstr "�е удаёт�� перенаправить на �ервер: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166
 msgid "Could not save avatar info"
-msgstr ""
+msgstr "�е удаёт�� �охранить информацию об аватаре"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159
 msgid "Could not save new profile info"
-msgstr ""
+msgstr "�е удаёт�� �охранить новую информацию профил�"
 
-#: ../lib/subs.php:54 lib/subs.php:61
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
 msgid "Could not subscribe other to you."
-msgstr ""
+msgstr "�е удаёт�� подпи�ать других на Вашу ленту."
 
-#: ../lib/subs.php:46 lib/subs.php:46
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
 msgid "Could not subscribe."
-msgstr ""
+msgstr "Подпи�ка неудачна."
 
 #: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+#: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
-msgstr ""
+msgstr "�е удаёт�� одновить пользовател� � подтверждённым �лектронным адре�ом."
 
 #: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
-msgstr ""
+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 ""
+msgstr "�е удаёт�� удалить подверждение по �лектронному адре�у."
 
-#: ../lib/subs.php:103 lib/subs.php:116
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
-msgstr ""
+msgstr "�е удаёт�� удалить подпи�ку."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:84
 msgid "Couldn't find any statuses."
-msgstr ""
+msgstr "�ет �тату�ов."
 
 #: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:178
 msgid "Couldn't get a request token."
-msgstr ""
+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 ""
+msgstr "�е удаёт�� в�тавить код подтверждени�."
 
 #: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
 msgid "Couldn't insert new subscription."
-msgstr ""
+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 ""
+msgstr "�е удаёт�� �охранить профиль."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:279
 msgid "Couldn't update user for autosubscribe."
-msgstr ""
+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 ""
+msgstr "�е удаёт�� обновить пользователь�кую запи�ь."
 
 #: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
@@ -582,372 +705,460 @@ msgstr ""
 #: 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 ""
+msgstr "�е удаёт�� обновить пользовател�."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../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 ""
+msgstr "Создать нового пользовател� � таким именем."
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
-msgstr "Создать новый учёт"
+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 ""
+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 ""
+msgstr "Подтверждённый в на�то�щее врем� �лектронный адре�."
 
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
 msgstr "Сейча�"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
 #, php-format
 msgid "DB error inserting hashtag: %s"
-msgstr ""
+msgstr "Ошибка баз данных при в�тавке хеш-тегов дл� %s"
 
-#: ../lib/util.php:1061 lib/util.php:1110
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
-msgstr ""
+msgstr "Ошибка баз данных при в�тавке ответа дл� %s"
 
-#: ../actions/deletenotice.php:41
+#: ../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 букв"
+msgstr "Опиши �еб� и �вои увлечени� при помощи 140 �имволов"
 
 #: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
-msgstr "Почта"
+msgstr "Электронный адре�"
 
-#: ../actions/emailsettings.php:59
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
 msgid "Email Address"
-msgstr "Почтовый адре�"
+msgstr "Электронный адре�"
 
-#: ../actions/emailsettings.php:32
+#: ../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:73 actions/register.php:80 actions/register.php:163
 msgid "Email address already exists."
-msgstr ""
+msgstr "Такой �лектронный адре� уже задей�твован."
 
-#: ../lib/mail.php:90 lib/mail.php:90
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
-msgstr ""
+msgstr "Подтверждение �лектронного адре�а"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
 msgid "Email address, like \"UserName@example.org\""
-msgstr ""
+msgstr "Электронный адре� вида \"UserName@example.org\""
 
-#: ../actions/invite.php:129
+#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
 msgid "Email addresses"
-msgstr "Почтовые адре�а"
+msgstr "Почтовый адре�"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:231
 msgid "Enter a nickname or email address."
-msgstr ""
+msgstr "Введите им� или �лектронный адре�."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
+#: actions/smssettings.php:119
 msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "Введите код, который вы получили по телефону."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
+#: actions/userauthorization.php:161
 msgid "Error authorizing token"
-msgstr ""
+msgstr "Ошибка авторизации входа"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:297
 msgid "Error connecting user to OpenID."
-msgstr ""
+msgstr "Ошибка при �оединении пользовател� � OpenID."
 
 #: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+#: actions/finishaddopenid.php:126
 msgid "Error connecting user."
-msgstr ""
+msgstr "Ошибка при �оединении пользовател�."
 
 #: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
 msgid "Error inserting avatar"
-msgstr ""
+msgstr "Ошибка при в�тавке аватара"
 
 #: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
 msgid "Error inserting new profile"
-msgstr ""
+msgstr "Ошибка при в�тавке нового профил�"
 
 #: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
 msgid "Error inserting remote profile"
-msgstr ""
+msgstr "Ошибка в�тавки удалённого профил�"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
-msgstr ""
+msgstr "Ошибка �охранени� подтверждённого адре�а."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
 msgid "Error saving remote profile"
-msgstr ""
+msgstr "Ошибка �охранени� удалённого профил�"
 
-#: ../lib/openid.php:226 lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving the profile."
-msgstr ""
+msgstr "Ошибка �охранени� текущего профил�."
 
-#: ../lib/openid.php:237 lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
 msgid "Error saving the user."
-msgstr ""
+msgstr "Ошибка �охранени� текущего пользовател�."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164
 msgid "Error saving user; invalid."
-msgstr ""
+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/register.php:108 actions/login.php:112 actions/login.php:138
+#: actions/recoverpassword.php:354 actions/register.php:198
 msgid "Error setting user."
-msgstr ""
+msgstr "Ошибка в у�тановках пользовател�."
 
 #: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
 msgid "Error updating profile"
-msgstr ""
+msgstr "Ошибка обновлени� профил�"
 
 #: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
 msgid "Error updating remote profile"
-msgstr ""
+msgstr "Ошибка обновлени� удалённого профил�"
 
 #: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+#: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
-msgstr ""
+msgstr "Ошибка, �в�занна� � кодом подтверждени�."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
-msgstr ""
+msgstr "Суще�твующее им�"
 
-#: ../lib/util.php:326
+#: ../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 ""
+msgstr "�еудача при обновлении аватара."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64
+#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
 #, php-format
 msgid "Feed for friends of %s"
-msgstr ""
+msgstr "Лента друзей %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66
+#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
+#: actions/repliesrss.php:71
 #, php-format
 msgid "Feed for replies to %s"
-msgstr ""
+msgstr "Лента ответов %s"
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
 #, php-format
 msgid "Feed for tag %s"
-msgstr ""
+msgstr "Лента тегов %s"
 
 #: ../lib/searchaction.php:105 lib/searchaction.php:105
+#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
-msgstr ""
+msgstr "�айти заметку по �одержимому"
 
 #: ../lib/searchaction.php:101 lib/searchaction.php:101
+#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
-msgstr ""
+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/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 букв)."
+msgstr "Полное им� �лишком длинное (не больше 255 знаков)."
 
-#: ../lib/util.php:322
+#: ../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: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 "Страница"
+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 ""
+msgstr "URL Главной �траницы неверен."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:173
 msgid "I want to post notices by email."
-msgstr ""
+msgstr "Я хочу отправл�ть заметки по �лектронной почте."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: lib/connectsettingsaction.php:104
 msgid "IM"
-msgstr ""
+msgstr "IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
+#: actions/imsettings.php:118
 msgid "IM Address"
-msgstr ""
+msgstr "IM-адре�"
 
 #: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
-msgstr ""
+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 ""
+msgstr "Вход�щий �лектронный адре�"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:443
 msgid "Incoming email address removed."
-msgstr ""
+msgstr "Вход�щий �лектронный адре� удалён."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153
 msgid "Incorrect old password"
-msgstr ""
+msgstr "�екорректный �тарый пароль"
 
-#: ../actions/login.php:67 actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
 msgid "Incorrect username or password."
-msgstr ""
+msgstr "�екорректное им� или пароль."
 
 #: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
+"Ин�трукции по во��тановлению парол� по�ланы на �лектронный адре�, который Вы "
+"указали при реги�трации Вашего �чёта."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
-msgstr ""
+msgstr "�еверный URL-адре� аватара '%s'"
 
-#: ../actions/invite.php:55 actions/invite.php:62
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
 #, php-format
 msgid "Invalid email address: %s"
-msgstr ""
+msgstr "�еверный �лектронный адре�: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
-msgstr ""
+msgstr "�еверна� домашн�� �траничка дл� '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
-msgstr ""
+msgstr "�еверный URL лицензии дл� '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
 msgid "Invalid notice content"
-msgstr ""
+msgstr "�еверный контент заметки"
 
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72
 msgid "Invalid notice uri"
-msgstr ""
+msgstr "�еверный URI заметки"
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
-msgstr ""
+msgstr "�еверный URL заметки"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
-msgstr ""
+msgstr "�еверный URL профил� дл� '%s'."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135
 msgid "Invalid profile URL (bad format)"
-msgstr ""
+msgstr "�еверный URL профил� (плохой формат)"
 
 #: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
-msgstr ""
+msgstr "�еврный URL профил� возвращённый �ервером."
 
 #: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
-msgstr ""
+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 ""
+msgstr "�еверное им� или пароль."
 
-#: ../actions/invite.php:79 actions/invite.php:86
+#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
 msgid "Invitation(s) sent"
-msgstr ""
+msgstr "Приглашение(�) ото�лано(ы)"
 
-#: ../actions/invite.php:97 actions/invite.php:104
+#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
 msgid "Invitation(s) sent to the following people:"
-msgstr ""
+msgstr "Приглашение(�) ото�лано(ы) �ледующим адре�атам:"
 
-#: ../lib/util.php:306
+#: ../lib/util.php: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:123 actions/invite.php:130 actions/invite.php:104
 msgid "Invite new users"
-msgstr ""
+msgstr "Пригла�ить новых пользователей"
 
-#: ../lib/util.php:261 lib/util.php:277
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, php-format
 msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
+"Этот �ерви� работает при помощи [Laconica](http://laconi.ca/) - программного "
+"обе�печени� дл� микроблогинга, вер�ии %s, до�тупного под лицензией [GNU "
+"Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-"
+"3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: actions/imsettings.php:296
 msgid "Jabber ID already belongs to another user."
-msgstr ""
+msgstr "Этот Jabber ID уже и�пользует�� другим пользователем."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
@@ -955,73 +1166,100 @@ msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
+"Jabber или GTalk - адре�, типа \"UserName@example.org\". Первым делом "
+"убедите�ь, что добавили %s в �пи�ок Ваших корре�пондентов на Вашем IM-"
+"ме��енджере или в GTalk."
 
-#: ../actions/profilesettings.php:57
+#: ../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 ""
+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 ""
+msgstr "Слишком длинное ме�то житель�тва (более 255 знаков)."
 
 #: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/openidlogin.php:68 ../lib/util.php: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 "Вход"
+msgstr "�вторизаци�"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr ""
+msgstr "�вторизаци� при помощи [OpenID](%%doc.openid%%)."
 
 #: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
+"�вторизаци� � Вашим именем и паролем. Ещё не имеете пользователь�кого имени "
+"зде�ь?[Зареги�трируйте](%%action.register%%) новую запи�ь, или попробуйте "
+"авторизовать�� при помощи [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
-msgstr "Выйти"
+msgstr "Выход"
 
-#: ../actions/register.php:166
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:393
 msgid "Longer name, preferably your \"real\" name"
-msgstr "Полное им�, лучше в�его на�то�щее"
+msgstr "Полное им�, предпочтительно Ваше на�то�щее им�"
 
-#: ../actions/login.php:110 actions/login.php:110
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
+#: lib/facebookaction.php:320
 msgid "Lost or forgotten password?"
-msgstr ""
+msgstr "Потер�ли или забыли пароль?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
 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%%."
-msgstr ""
+msgstr "Управление проце��ом получени� �лектронного адре�а � %%site.name%%."
 
-#: ../actions/showstream.php:300
+#: ../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:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
-msgstr ""
+msgstr "Микроблог от %s"
 
 #: ../actions/smssettings.php:304
 #, php-format
@@ -1029,183 +1267,232 @@ 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/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 ""
+msgstr "�овое"
 
-#: ../lib/mail.php:144 lib/mail.php:144
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
 #, php-format
 msgid "New email address for posting to %s"
-msgstr ""
+msgstr "�овый �лектронный адре� дл� по�тинга %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:465
 msgid "New incoming email address added."
-msgstr ""
+msgstr "�овый вход�щий �лектронный адре� добавлен."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+#: actions/finishopenidlogin.php:99
 msgid "New nickname"
-msgstr ""
+msgstr "�овое им�"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
-msgstr ""
+msgstr "�ова� заметка"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: actions/profilesettings.php:180 actions/recoverpassword.php:185
+#: 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 ""
+msgstr "�овый пароль у�пешно �охранён. Вы авторизовали�ь."
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
+#: 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 "Кличка"
+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 ""
+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 ""
+msgstr "Такое им� недопу�тимо."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
+#: actions/remotesubscribe.php:106
 msgid "Nickname of the user you want to follow"
-msgstr ""
+msgstr "Им� пользовател�, которому Вы хотите �ледовать"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
-msgstr ""
+msgstr "Им� или �лектронный адре�"
 
-#: ../actions/deletenotice.php:59
+#: ../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 ""
+msgstr "�е Jabber ID."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
-msgstr ""
+msgstr "�е авторизованный запро�!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
+#: actions/smssettings.php:299
 msgid "No carrier selected."
-msgstr ""
+msgstr "Провайдер не выбран."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
+#: actions/smssettings.php:486
 msgid "No code entered"
-msgstr ""
+msgstr "Код не введён"
 
 #: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
+#: actions/confirmaddress.php:75
 msgid "No confirmation code."
-msgstr ""
+msgstr "�ет кода подтверждени�."
 
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
+#: actions/newnotice.php:126 classes/Command.php:223
 msgid "No content!"
-msgstr ""
+msgstr "�ет контента!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:304
 msgid "No email address."
-msgstr ""
+msgstr "�ет �лектронного адре�а."
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32
+#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
 msgid "No id."
-msgstr ""
+msgstr "�ет идентификатора."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:430
 msgid "No incoming email address."
-msgstr ""
+msgstr "�ет вход�щего �лектронного адре�а."
 
 #: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
 msgid "No nickname provided by remote server."
-msgstr ""
+msgstr "�ет имени пред�тавленного удалённым �ервером."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
-msgstr ""
+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 ""
+msgstr "�ет подтверждени� отказа."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
+#: actions/smssettings.php:294
 msgid "No phone number."
-msgstr ""
+msgstr "�ет номера телефона."
 
 #: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
 msgid "No profile URL returned by server."
-msgstr ""
+msgstr "�ет URL профил�, который вернул �ервер."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+#: actions/recoverpassword.php:266
 msgid "No registered email address for that user."
-msgstr ""
+msgstr "�ет зареги�трированных �лектронных адре�ов дл� �того пользовател�."
 
 #: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
 msgid "No request found!"
-msgstr ""
+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 ""
+msgstr "�ет результатов."
 
 #: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
-msgstr ""
+msgstr "�ет размера."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
+#: actions/twitapistatuses.php:446
 msgid "No status found with that ID."
-msgstr ""
+msgstr "�ет �тату�а � таким ID."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
 msgid "No status with that ID found."
-msgstr ""
+msgstr "�е найдено �тату�а � таким ID."
 
 #: ../actions/openidsettings.php:135 actions/openidsettings.php:144
+#: actions/openidsettings.php:222
 msgid "No such OpenID."
-msgstr ""
+msgstr "�ет такого OpenID."
 
-#: ../actions/doc.php:29 actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
-msgstr ""
+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:83 lib/deleteaction.php:30 actions/shownotice.php:87
+#: lib/deleteaction.php:51
 msgid "No such notice."
-msgstr ""
+msgstr "�ет такой заметки."
 
 #: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+#: actions/recoverpassword.php:62
 msgid "No such recovery code."
-msgstr ""
+msgstr "�ет такого кода во��тановлени�."
 
 #: ../actions/postnotice.php:56 actions/postnotice.php:57
+#: actions/postnotice.php:60
 msgid "No such subscription"
-msgstr ""
+msgstr "�ет такой подпи�ки"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
 #: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
@@ -1222,82 +1509,104 @@ msgstr ""
 #: 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
+#: 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 ""
+msgstr "�ет такого пользовател�."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+#: actions/recoverpassword.php:251
 msgid "No user with that email address or username."
-msgstr ""
+msgstr "�ет пользовател� � таким �лектронным адре�ом или именем."
 
 #: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
-msgstr ""
+msgstr "�ичего показывать!"
 
 #: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+#: actions/recoverpassword.php:66
 msgid "Not a recovery code."
-msgstr ""
+msgstr "�ет кода во��тановлени�."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+#: scripts/maildaemon.php:53
 msgid "Not a registered user."
-msgstr ""
+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:502 lib/twitterapi.php:448 lib/twitterapi.php:476
+#: lib/twitterapi.php:566
 msgid "Not a supported data format."
-msgstr ""
+msgstr "�еподдерживаемый формат данных."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
+#: actions/imsettings.php:290
 msgid "Not a valid Jabber ID"
-msgstr ""
+msgstr "�еверный код Jabber ID"
 
-#: ../lib/openid.php:131 lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
-msgstr ""
+msgstr "�еверный код OpenID."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:315
 msgid "Not a valid email address"
-msgstr ""
+msgstr "�еверный �лектронный адре�"
 
-#: ../actions/register.php:63 actions/register.php:70
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
 msgid "Not a valid email address."
-msgstr ""
+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 ""
+msgstr "�еверное им�."
 
 #: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:159
 msgid "Not a valid profile URL (incorrect services)."
-msgstr ""
+msgstr "�еверный URL профил� (некорректный �ерви�)."
 
 #: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+#: actions/remotesubscribe.php:152
 msgid "Not a valid profile URL (no XRDS defined)."
-msgstr ""
+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 ""
+msgstr "�еверный URL профил� (не YADIS-документ)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
-msgstr ""
+msgstr "�е �вл�ет�� изображением или разрушенный файл."
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
-msgstr ""
+msgstr "�е авторизовано."
 
 #: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
-msgstr ""
+msgstr "�еожиданный ответ!"
 
-#: ../actions/twitapistatuses.php:422
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:309
 msgid "Not found"
-msgstr "�е нашли"
+msgstr "�е найдено"
 
 #: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
 #: ../actions/newnotice.php:29 ../actions/subscribe.php:28
@@ -1306,148 +1615,181 @@ msgstr "�е нашли"
 #: 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
+#: 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 ""
+msgstr "�е авторизован."
 
-#: ../lib/subs.php:91 lib/subs.php:104
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
-msgstr ""
+msgstr "�е подпи�ан!"
 
 #: ../actions/opensearch.php:35 actions/opensearch.php:35
+#: actions/opensearch.php:67
 msgid "Notice Search"
-msgstr ""
+msgstr "Пои�к в заметках"
 
 #: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:180 actions/showstream.php:187
+#: actions/showstream.php:192
 #, php-format
 msgid "Notice feed for %s"
-msgstr ""
+msgstr "Лента заметок дл� %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:94
 msgid "Notice has no profile"
-msgstr ""
+msgstr "Заметка без профил�"
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php: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:81 actions/tag.php:41
 #, php-format
 msgid "Notices tagged with %s"
-msgstr ""
+msgstr "Заметки, помеченные %s"
 
-#: ../actions/password.php:39
+#: ../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/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
+#: lib/logingroupnav.php:81
 msgid "OpenID"
-msgstr ""
+msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73
 msgid "OpenID Account Setup"
-msgstr ""
+msgstr "У�тановки OpenID"
 
-#: ../lib/openid.php:180 lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
-msgstr ""
+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 ""
+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 ""
+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 ""
+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 ""
+msgstr "�вторизаци� при помощи OpenID неудачна: %s"
 
-#: ../lib/openid.php:133 lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
-msgstr ""
+msgstr "�еверный OpenID: %s"
 
 #: ../actions/openidsettings.php:144 actions/openidsettings.php:153
+#: actions/openidsettings.php:231
 msgid "OpenID removed."
-msgstr ""
+msgstr "OpenID удалён."
 
 #: ../actions/openidsettings.php:37 actions/openidsettings.php:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
-msgstr ""
+msgstr "У�тановки OpenID"
 
-#: ../actions/invite.php:135
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
 msgid "Optionally add a personal message to the invitation."
-msgstr "Дополнительно добавь к приглашению личное �ообщение."
+msgstr "Можно добавить к приглашению личное �ообщение."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
-msgstr ""
+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 ""
+msgstr "Пароль и его подтверждение не �овпадают."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+#: actions/recoverpassword.php:331
 msgid "Password must be 6 chars or more."
-msgstr ""
+msgstr "Пароль должен быть длиной не менее 6 �имволов."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
 msgid "Password recovery requested"
-msgstr ""
+msgstr "Запрошено во��тановление парол�"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 msgid "Password saved."
-msgstr ""
+msgstr "Пароль �охранён."
 
 #: ../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 ""
+msgstr "Пароли не �овпадают."
 
-#: ../lib/searchaction.php:100
+#: ../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"
-msgstr ""
+msgstr "Пои�к людей"
 
 #: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
-msgstr ""
+msgstr "Пои�к людей"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
-msgstr "Свои"
+msgstr "Личное"
 
-#: ../actions/invite.php:133
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
 msgid "Personal message"
 msgstr "Личное �ообщение"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
 msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
+msgstr "�омер телефона, без пробелов, � кодом зоны"
 
 #: ../actions/userauthorization.php:78
 msgid ""
@@ -1455,112 +1797,144 @@ msgid ""
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
+"Пожалуй�та, отметьте �ти подробно�ти, чтобы быть уверенным, что Вы хотите "
+"подпи�ать�� на �ти заметки. Е�ли Вы �того не хотите делать, то выберите "
+"пункт \"Отказ\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
+#: actions/imsettings.php:142
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
+msgstr "Публиковать заметку, когда мой Jabber/GTalk - �тату� измен�ет��."
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 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 ""
+msgstr "Предпочтени� �охранены."
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:129
 msgid "Preferred language"
 msgstr "Любимый �зык"
 
-#: ../lib/util.php:328
+#: ../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:119 classes/Notice.php:145 classes/Notice.php:155
 msgid "Problem saving notice."
-msgstr ""
+msgstr "Проблемы � �охранением заметки."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 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 ""
+msgstr "URL профил�"
 
-#: ../actions/profilesettings.php:34
+#: ../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 ""
+msgstr "�еизве�тный профиль"
 
-#: ../actions/public.php:54 actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
-msgstr ""
+msgstr "Лента публичного потока"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
-msgstr "Публична� дорожка"
+msgstr "Публична� хронологи�"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
 msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
+msgstr "Опубликовать MicroID дл� моего Jabber/GTalk - адре�а."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
 msgid "Publish a MicroID for my email address."
-msgstr ""
+msgstr "Опубликовать MicroID дл� моего �лектронного адре�а."
 
 #: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
 #: actions/tag.php:76
 msgid "Recent Tags"
-msgstr ""
+msgstr "Свежие теги"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
-msgstr ""
+msgstr "Во��тановление"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198
 msgid "Recover password"
-msgstr ""
+msgstr "Во��тановление парол�"
 
 #: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
+#: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
-msgstr ""
+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 "Учёт"
+msgstr "Реги�траци�"
 
 #: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
 msgid "Registration not allowed."
-msgstr ""
+msgstr "Реги�траци� недопу�тима."
 
 #: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
 msgid "Registration successful"
-msgstr ""
+msgstr "Реги�траци� у�пешна!"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
-msgstr ""
+msgstr "Отбро�ить"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414
 msgid "Remember me"
 msgstr "Запомнить мен�"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
-msgstr ""
+msgstr "Удаление профил� как не�оответ�твующего"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
-msgstr ""
+msgstr "Удалить подпи�ку"
 
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
@@ -1568,83 +1942,109 @@ msgstr ""
 #: 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/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 ""
+msgstr "Убрать"
 
 #: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
-msgstr ""
+msgstr "Убрать OpenID"
 
 #: ../actions/openidsettings.php:73
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
+"Удаление по�леднего OpenID делает авторизацию невозможной! Е�ли Вы в�ё же "
+"хотите удалить �тот OpenID, то �начала добавьте ещё один."
 
-#: ../lib/stream.php:55
+#: ../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 ""
+msgstr "Ответы дл� %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
-msgstr ""
+msgstr "Переу�тановить"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
-msgstr ""
+msgstr "Переу�тановить пароль"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
 msgid "SMS"
-msgstr ""
+msgstr "СМС"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
 msgid "SMS Phone number"
-msgstr ""
+msgstr "�омер телефона дл� СМС"
 
 #: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
 msgid "SMS Settings"
-msgstr ""
+msgstr "У�тановки СМС"
 
-#: ../lib/mail.php:219 lib/mail.php:225
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
 msgid "SMS confirmation"
-msgstr ""
+msgstr "Подтверждение СМС"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
 msgid "Same as password above"
-msgstr ""
+msgstr "Тот же пароль, что и выше"
 
-#: ../actions/register.php:156
+#: ../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: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 ""
+msgstr "Лента пои�кового потока"
 
-#: ../actions/noticesearch.php:30
+#: ../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 буквы."
+"Пои�к по �одержанию заметок на %%site.name%%. Между терминами �тавь пробелы. "
+"Минимальна� длина �лова — 3 буквы."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1652,197 +2052,245 @@ msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Пои�к людей на %%site.name%% по имени, "
-"житель�тву или интере�ам. Между "
-"терминами �тавь пробелы. Минимальна� длина �лова — 3 буквы."
+"Пои�к людей на %%site.name%% по имени, житель�тву или интере�ам. Раздел�йте "
+"термины пробелами. Минимальна� длина �лова — 3 буквы."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: actions/smssettings.php:457
 msgid "Select a carrier"
-msgstr ""
+msgstr "Выбор провайдера"
 
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
+#: lib/messageform.php:167 lib/noticeform.php:177
 msgid "Send"
-msgstr "По�лать"
+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 ""
+msgstr "По�ылать �лектронные пи�ьма на �тот адре� дл� по�тинга новых заметок."
 
-#: ../actions/emailsettings.php:88
+#: ../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 ""
+msgstr "По�ылать мне заметки через Jabber/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
+"По�ылать мне заметки через СМС; � понимаю, что �то может приве�ти к "
+"чрезмерным ра�ходам по пере�ылке."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
+"По�ылать мне реплики через Jabber/GTalk от людей, на которых � не подпи�ан."
 
-#: ../lib/util.php:304
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr "�а�тройки"
 
-#: ../actions/profilesettings.php:192
+#: ../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 ""
+msgstr "Показывать �амые попул�рные теги за по�леднюю неделю."
 
 #: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
+#: actions/finishaddopenid.php:114
 msgid "Someone else already has this OpenID."
-msgstr ""
+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 ""
+msgstr "Случило�ь что-то �транное."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+#: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
-msgstr ""
+msgstr "Про�тите, вход�щих пи�ем нет."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+#: scripts/maildaemon.php:57
 msgid "Sorry, that is not your incoming email address."
-msgstr ""
+msgstr "Про�тите, �то не Ваш вход�щий �лектронный адре�."
 
-#: ../lib/util.php:330
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
 msgid "Source"
 msgstr "И�ходник"
 
-#: ../actions/showstream.php:296
+#: ../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 ""
+msgstr "Запи�анный OpenID не найден."
 
 #: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
+#: 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 ""
+msgstr "Подпи�ка авторизована"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
-msgstr ""
+msgstr "Подпи�ка отменена"
 
 #: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
+#: ../actions/subscriptions.php:27 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
+#: actions/showstream.php:407 actions/showstream.php:489
+#: lib/subgroupnav.php:80
 msgid "Subscriptions"
-msgstr "Подпи�ка"
+msgstr "Подпи�ки"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
 msgid "System error uploading file."
-msgstr ""
+msgstr "Си�темна� ошибка при загрузке файла."
 
-#: ../actions/tag.php:41 ../lib/util.php:301
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
+#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
+#: lib/profilelist.php:164
 msgid "Tags"
-msgstr "Метки"
+msgstr "Теги"
 
-#: ../lib/searchaction.php:104
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
 msgid "Text"
 msgstr "Тек�т"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:67
 msgid "Text search"
-msgstr ""
+msgstr "Пои�к тек�та"
 
 #: ../actions/openidsettings.php:140 actions/openidsettings.php:149
+#: actions/openidsettings.php:227
 msgid "That OpenID does not belong to you."
-msgstr ""
+msgstr "Это не Ваш OpenID."
 
 #: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
-msgstr ""
+msgstr "Этот адре� уже подтверждён."
 
 #: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
-msgstr ""
+msgstr "Это не Ваш код подтверждени�!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
 msgid "That email address already belongs to another user."
-msgstr ""
+msgstr "Этот �лектронный адре� уже задей�твован другим пользователем."
 
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
 msgid "That file is too big."
-msgstr ""
+msgstr "Это �лишком большой файл."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
-msgstr ""
+msgstr "Это уже Ваш Jabber ID."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
 msgid "That is already your email address."
-msgstr ""
+msgstr "Это уже Ваш �лектронный адре�."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
 msgid "That is already your phone number."
-msgstr ""
+msgstr "Это уже ваш номер телефона."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
-msgstr ""
+msgstr "Это не Ваш Jabber ID."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:397
 msgid "That is not your email address."
-msgstr ""
+msgstr "Это не Ваш �лектронный адре�."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
+#: actions/smssettings.php:393
 msgid "That is not your phone number."
-msgstr ""
+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 ""
+msgstr "Это неверный IM-адре�."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
+#: actions/smssettings.php:362
 msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "Это неверный номер подтверждени�."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
+#: actions/smssettings.php:309
 msgid "That phone number already belongs to another user."
-msgstr ""
+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 ""
+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 ""
+msgstr "Слишком длинна� заметка. Мак�имальна� длина - 255 знаков."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
-msgstr ""
+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 ""
+msgstr "�дре� удалён."
 
 #: ../actions/userauthorization.php:312
 msgid ""
@@ -1850,6 +2298,8 @@ msgid ""
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
+"Подпи�ка авторизована, но нет обратного URL. По�мотрите ин�трукции на �айте "
+"о том, как авторизовать подпи�ку. Ваш подпи�очный купон: "
 
 #: ../actions/userauthorization.php:322
 msgid ""
@@ -1857,159 +2307,195 @@ msgid ""
 "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 ""
+msgstr "Это пользователи, которые читают заметки %s."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
-msgstr ""
+msgstr "Это пользователи, которые читают Ваши заметки."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
-msgstr ""
+msgstr "Это пользователи, заметки которых читает %s."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
-msgstr ""
+msgstr "Это пользователи, заметки которых Вы читаете."
 
-#: ../actions/invite.php:89 actions/invite.php:96
+#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
 msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
+"Это люди, которые уже �вл�ют�� пользовател�ми, и на которых Вы подпи�али�ь "
+"автоматиче�ки:"
 
 #: ../actions/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
-msgstr ""
+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/twitapistatuses.php:511 actions/twitapifavorites.php:97
+#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
 msgid "This method requires a POST or DELETE."
-msgstr ""
+msgstr "Этот метод требует 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/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 ""
+msgstr "Этот метод требует POST."
 
 #: ../lib/util.php:164 lib/util.php:246
 msgid "This page is not available in a media type you accept"
-msgstr ""
+msgstr "Страница недо�тупна дл� того типа, который Вы задей�твовали."
 
-#: ../actions/profilesettings.php:63
+#: ../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 ""
+msgstr "Ча�овой по�� не выбран."
 
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
+"Чтобы подпи�ать��, необходимо [авторизовать��](%%action.login%%) или "
+"[зареги�трировать��](%%action.register%%) � новым �чётом. Е�ли Вы уже имеет "
+"�чёт на [подход�щем �айте микроблогинга](%%doc.openmublog%%),  то введите "
+"URL Вашего профил� ниже."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:132
 msgid "Two user ids or screen_names must be supplied."
-msgstr ""
+msgstr "�адо пред�тавить два имени пользовател� или кода."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: 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 ""
+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/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 ""
+msgstr "�етиповое подтверждение формы."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323
 msgid "Unexpected password reset."
-msgstr ""
+msgstr "�етипова� переу�тановка парол�."
 
-#: ../index.php:57 index.php:57
+#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
 msgid "Unknown action"
-msgstr ""
+msgstr "�еизве�тное дей�твие"
 
 #: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
 msgid "Unknown version of OMB protocol."
-msgstr ""
+msgstr "�еизве�тна� вер�и� OMB-протокола."
 
 #: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
+"Там, где �то не оговорено �пециально, �одержимое �того �айта защищено "
+"автор�кими правами и предо�тавл�ет�� под "
 
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
-msgstr ""
+msgstr "�ера�познанный тип адре�а %s"
 
-#: ../actions/showstream.php:209
+#: ../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 ""
+msgstr "�еподдерживаема� вер�и� OMB"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
-msgstr ""
+msgstr "�еподдерживаемый формат файла изображени�."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
 msgid "Updates by SMS"
-msgstr ""
+msgstr "Обновлени� по СМС"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
 msgid "Updates by instant messenger (IM)"
-msgstr ""
+msgstr "Обновлено по IM"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:129
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+msgstr "Обновлено от %1$s и его друзей на %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
 #, php-format
 msgid "Updates from %1$s on %2$s!"
-msgstr ""
+msgstr "Обновлено от %1$s на %2$s!"
 
-#: ../actions/avatar.php:68
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/avatarsettings.php:162 actions/grouplogo.php:232
 msgid "Upload"
 msgstr "Загрузить"
 
@@ -2020,25 +2506,29 @@ msgid ""
 "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 ""
+msgstr "Загрузить новое профильное изображение"
 
-#: ../actions/invite.php:114
+#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
 msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr "В �том формул�ре ты можешь пригла�ить друзей и коллег на наш �ерви�."
+"Use this form to invite your friends and colleagues to use this service."
+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:88 actions/finishremotesubscribe.php:94
 msgid "User being listened to doesn't exist."
-msgstr ""
+msgstr "Пользователь от�леживает не�уще�твующее."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
 #: ../actions/foaf.php:47 ../actions/replies.php:41
@@ -2050,110 +2540,143 @@ msgstr ""
 #: 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 ""
+msgstr "У пользовател� нет профил�."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
-msgstr ""
+msgstr "Им� пользовател�."
 
-#: ../actions/twitapiusers.php:75
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
 msgid "User not found."
 msgstr "Пользователь не найден."
 
-#: ../actions/profilesettings.php:63
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
 msgid "What timezone are you normally in?"
-msgstr "В каком ча�овом по��е ты обычно находишь��?"
+msgstr "В каком ча�овом по��е Вы обычно находите�ь?"
 
-#: ../lib/util.php:1159
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
-msgstr "Что �лышно, %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 "Где ты находишь��, например «Город, Страна»"
+msgstr "Где Вы находите�ь, например «Город, штат (или обла�ть), �трана»"
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
-msgstr ""
+msgstr "�еверный тип изображени� дл� '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
-msgstr ""
+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 ""
+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 ""
+msgstr "Вы уже авторизованы!"
 
-#: ../actions/invite.php:81 actions/invite.php:88
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
 msgid "You are already subscribed to these users:"
-msgstr ""
+msgstr "Вы уже подпи�аны на пользовател�:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
 msgid "You are not friends with the specified user."
-msgstr ""
+msgstr "Вы не �вл�ете�ь другом дл� �того пользовател�."
 
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
-msgstr ""
+msgstr "Вы можете помен�ть Ваш пароль зде�ь. Выберите другой!"
 
-#: ../actions/register.php:135
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
-msgstr "Ты можешь в�тать на учёт и пи�ать �вои заметки."
+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/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
+"Вы можете удалить OpenID из �воего �чёта, нажав на клавишу, помеченную "
+"�ловом \"Убрать\". "
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
+"Вы можете отправл�ть и получать заметки через Jabber/GTalk [онлайн-"
+"ме��енджер](%%doc.im%%). �а�тройте Ваш адре� и у�тановки ниже."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"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 ""
+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 "Ты не можешь в�тать на учёт, е�ли ты не �огла�ен � лицензией."
+msgstr ""
+"Вы не можете зареги�трировать��, е�ли Вы не подтверждаете лицензионного "
+"�оглашени�."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67
 msgid "You did not send us that profile"
-msgstr ""
+msgstr "Вы не по�ылали нам �тот профиль."
 
 #: ../lib/mail.php:147
 #, php-format
@@ -2167,33 +2690,42 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s"
 msgstr ""
+"У Ва� новый адре� по�тинга на %1$s.\n"
+"По�ылайте �лектронные пи�ьма на %2$s дл� по�тинга новых заметок.Ин�трукции "
+"по �лектронным публикаци�м заметок на %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 ""
+msgstr "Вы не можете удал�ть �тату� других пользователей."
 
-#: ../actions/invite.php:31 actions/invite.php:31
+#: ../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: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 ""
+msgstr "Вы идентифицированны. Введите новый пароль ниже."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
-msgstr ""
+msgstr "�дре� (URL) Вашего OpenID"
 
 #: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
-msgstr ""
+msgstr "Ваше им� на �том �ервере или �лектронный адре� реги�трации."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -2201,76 +2733,85 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
+"[OpenID](%%doc.openid%%) позвол�ет Вам авторизовать�� на многих �айтах при "
+"помощи только лишь одной запи�и.  Управл�йте Вашим а��оциированным �чётом "
+"OpenIDs от�юда."
 
-#: ../lib/util.php:943
+#: ../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:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
-msgstr "%d дней назад"
+msgstr "около %d дн�(ей) назад"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
-msgstr "%d ча�ов назад"
+msgstr "около %d ча�а(ов) назад"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
-msgstr "%d минут назад"
+msgstr "около %d минут(ы) назад"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
-msgstr "%d ме��цев назад"
+msgstr "около %d ме��ца(ев) назад"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
-msgstr "день назад"
+msgstr "около дн� назад"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
-msgstr "минуту назад"
+msgstr "около минуты назад"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
-msgstr "ме��ц назад"
+msgstr "около ме��ца назад"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
-msgstr "год назад"
+msgstr "около года назад"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
-msgstr "ча� назад"
+msgstr "около ча�а назад"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
 msgid "delete"
 msgstr "удалить"
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../lib/stream.php:117 actions/noticesearch.php:136
+#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
 msgid "in reply to..."
 msgstr "в ответ на..."
 
 #: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "ответить"
 
-#: ../actions/password.php:44
+#: ../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 ""
+msgstr "неподдерживаемый тип файла"
 
-#: ../lib/util.php:1309
+#: ../lib/util.php:1309 lib/util.php:1443
+#, fuzzy
 msgid "« After"
-msgstr "« Следующие"
+msgstr "« Ранее"
 
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
@@ -2281,190 +2822,213 @@ msgstr "« Следующие"
 #: 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 ""
+msgstr "Проблема � Вашей �е��ией. Попробуйте ещё раз, пожалуй�та."
 
-#: actions/disfavor.php:55
+#: actions/disfavor.php:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
-msgstr ""
+msgstr "Эта заметка не входит в чи�ло Ваших любимых заметок!"
 
-#: actions/disfavor.php:63
+#: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
-msgstr ""
+msgstr "�е удаёт�� удалить любимую заметку."
 
-#: actions/disfavor.php:72
+#: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
-msgstr ""
+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: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:53 actions/twitapifavorites.php:142 actions/favor.php:81
+#: actions/twitapifavorites.php:118
 msgid "This notice is already a favorite!"
-msgstr ""
+msgstr "Эта заметка уже входит в чи�ло любимых!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:86
+#: actions/twitapifavorites.php:125 classes/Command.php:152
 msgid "Could not create favorite."
-msgstr ""
+msgstr "�е удаёт�� �оздать любимую заметку."
 
 #: actions/favor.php:70
 msgid "Disfavor"
-msgstr ""
+msgstr "�елюбимое"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
 msgid "%s favorite notices"
-msgstr ""
+msgstr "%s любимые заметки"
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
-msgstr ""
+msgstr "Лента любимых заметок %s"
 
-#: actions/inbox.php:28
+#: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
-msgstr ""
+msgstr "Вход�щие дл� %s - �траница %d"
 
-#: actions/inbox.php:30
+#: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
-msgstr ""
+msgstr "Вход�щие дл� %s"
 
-#: actions/inbox.php:53
+#: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
+"Это Ваши вход�щие �ообщени�, где перечи�лены вход�щие приватные �ообщени�."
 
-#: actions/invite.php:178
+#: 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 ""
+msgstr "%1$s приглашает ва� при�оединить�� к %2$s (%3$s)."
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
+#: actions/register.php:416
 msgid "Automatically login in the future; "
-msgstr ""
+msgstr "�втоматиче�ки авторизовать�� в дальнейшем."
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
-msgstr ""
+msgstr "По причинам безопа�но�ти повторите, пожалуй�та, ваш пароль"
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:268
 msgid "Login with your username and password. "
-msgstr ""
+msgstr "�вторизаци� � Вашим именем и паролем."
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/twitapidirect_messages.php:141
 msgid "That's too long. Max message size is 140 chars."
-msgstr ""
+msgstr "Слишком длинно. Мак�имальна� длина �ообщени� - 140 знаков."
 
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:128
 msgid "No recipient specified."
-msgstr ""
+msgstr "�ет адре�ата."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:131
+#: actions/newmessage.php:168 classes/Command.php:237
 msgid "You can't send a message to this user."
-msgstr ""
+msgstr "Вы не можете по�лать �ообщение �тому пользователю."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: 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 ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr "�е по�ылайте �ообщени� �ами �ебе; про�то потихоньку �кажите �то �ебе."
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
 msgid "No such user"
-msgstr ""
+msgstr "�ет такого пользовател�"
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "New message"
-msgstr ""
+msgstr "�овое �ообщение"
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
-msgstr ""
+msgstr "Заметка без �оответ�твующего профил�"
 
-#: actions/openidsettings.php:28
+#: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
+msgstr "[OpenID](%%doc.openid%%) позвол�ет Вам авторизовать�� на многих �айтах"
 
-#: actions/openidsettings.php:46
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
-msgstr ""
+msgstr "Е�ли Вы хотите добавить OpenID к Вашему �чёту,"
 
 #: actions/openidsettings.php:74
 msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
+"Удаление един�твенного из о�тавших�� OpenID �делает невозможной авторизацию!"
 
-#: actions/openidsettings.php:87
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
-msgstr ""
+msgstr "Вы можете удалить OpenID из Вашего �чёта"
 
-#: actions/outbox.php:28
+#: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
-msgstr ""
+msgstr "И�ход�щие дл� %s - �траница %d"
 
-#: actions/outbox.php:30
+#: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
-msgstr ""
+msgstr "И�ход�щие дл� %s"
 
-#: actions/outbox.php:53
+#: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
+"Это �щик Ваших и�ход�щих пи�ем, зде�ь приватные �ообщени�, которые ото�ланы "
+"Вами."
 
-#: actions/peoplesearch.php:28
+#: 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/profilesettings.php:27
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
 msgid "You can update your personal profile info here "
-msgstr ""
+msgstr "Вы можете обновить зде�ь Вашу личную профильную информацию"
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
+#: 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 ""
+msgstr "Пользователь без �оответ�твующего профил�"
 
-#: actions/recoverpassword.php:91
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
-msgstr ""
+msgstr "Код подтверждени� �лишком �тарый."
 
-#: actions/recoverpassword.php:141
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
-msgstr ""
+msgstr "Е�ли Вы забыли или потер�ли Ваш"
 
-#: actions/recoverpassword.php:154
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
-msgstr ""
+msgstr "Вы идентифицированны. Введите "
 
-#: actions/recoverpassword.php:169
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
-msgstr ""
+msgstr "Ваше им� на �том �ервере,"
 
-#: actions/recoverpassword.php:271
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
-msgstr ""
+msgstr "Ин�трукции дл� во��тановлени� Вашего парол�"
 
-#: actions/recoverpassword.php:327
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
-msgstr ""
+msgstr "�овый пароль у�пешно �охранён."
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
-msgstr ""
+msgstr "Пароль должен быть длиной не менее 6 �имволов."
 
 #: actions/register.php:216
 #, php-format
@@ -2472,391 +3036,1994 @@ 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 ""
+msgstr "(Вы получили �лектронное �ообщение, от "
 
-#: actions/remotesubscribe.php:51
+#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
 #, php-format
 msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
+msgstr "чтобы подпи�ать��, Вы должны [авторизовать��](%%action.login%%),"
 
-#: actions/showfavorites.php:61
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
 #, php-format
 msgid "Feed for favorites of %s"
-msgstr ""
+msgstr "Лента любимых заметок от %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
 msgid "Could not retrieve favorite notices."
-msgstr ""
+msgstr "�е удаёт�� во��тановить любимые заметки."
 
-#: actions/showmessage.php:33
+#: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
-msgstr ""
+msgstr "�ет такого �ообщени�."
 
 #: actions/showmessage.php:42
 msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "Только отправитель и получатель могут читать �то �ообщение."
 
-#: actions/showmessage.php:61
+#: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "Сообщение дл� %1$s на %2$s"
 
-#: actions/showmessage.php:66
+#: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "Сообщение от %1$s на %2$s"
 
 #: actions/showstream.php:154
 msgid "Send a message"
-msgstr ""
+msgstr "Отправить �ообщение"
 
-#: actions/smssettings.php:312
+#: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
-msgstr ""
+msgstr "Ваш мобильный оператор."
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #, php-format
 msgid "Direct messages to %s"
-msgstr ""
+msgstr "Пр�мые �ообщени� дл� %s"
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
 msgid "All the direct messages sent to %s"
-msgstr ""
+msgstr "В�е пр�мые �ообщени� по�ланные дл� %s"
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
 msgid "Direct Messages You've Sent"
-msgstr ""
+msgstr "Пр�мые �ообщени� по�ланные Вами"
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #, php-format
 msgid "All the direct messages sent from %s"
-msgstr ""
+msgstr "В�е пр�мые �ообщени� от %s"
 
 #: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
 msgid "No message text!"
-msgstr ""
+msgstr "От�ут�твует тек�т �ообщени�!"
 
 #: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
 msgid "Recipient user not found."
-msgstr ""
+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/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #, php-format
 msgid "%s / Favorites from %s"
-msgstr ""
+msgstr "%s / Любимое от %s"
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
 msgid "%s updates favorited by %s / %s."
-msgstr ""
+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 ""
+msgstr "%s добавил Вашу заметку в �о�тав �воих любимых"
 
 #: 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 ""
+msgstr "%1$s добавил Вашу заметку от %2$s в �о�тав �воих любимых."
 
 #: actions/twittersettings.php:27
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
+"Добавьте Ваш �чёт на Твиттере дл� автоматиче�кой отправки Ваших заметок на "
+"Твиттер,"
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
-msgstr ""
+msgstr "У�тановки Твиттера"
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
-msgstr ""
+msgstr "Счёт на Твиттере"
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
-msgstr ""
+msgstr "Текущий проверенный �чёт на Твиттере."
 
 #: actions/twittersettings.php:63
 msgid "Twitter Username"
-msgstr ""
+msgstr "Им� на Твиттере"
 
-#: actions/twittersettings.php:65
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgid "No spaces, please."
-msgstr ""
+msgstr "Без пробелов, пожалуй�та."
 
 #: actions/twittersettings.php:67
 msgid "Twitter Password"
-msgstr ""
+msgstr "Пароль на Твиттере"
 
-#: actions/twittersettings.php:72
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
-msgstr ""
+msgstr "�втоматиче�ки отправл�ть мои заметки на Твиттер."
 
-#: actions/twittersettings.php:75
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Send local \"@\" replies to Twitter."
-msgstr ""
+msgstr "Отправл�ть локальные \"@\"-реплики на Твиттер."
 
-#: actions/twittersettings.php:78
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Subscribe to my Twitter friends here."
-msgstr ""
+msgstr "Подпи�ать�� на моих Твиттер-друзей зде�ь."
 
 #: actions/twittersettings.php:122
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
+"Им� пользовател� должно �о�то�т только из цифр, пропи�ных или �трочных букв "
+"и �имвола подчеркивани� (_). В�его не более 15 �имволов."
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
 msgid "Could not verify your Twitter credentials!"
-msgstr ""
+msgstr "�е удаёт�� подтвердить Ваши данные по Твиттеру!"
 
 #: actions/twittersettings.php:137
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
+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 ""
+msgstr "�е удаёт�� �охранить Ваши у�тановки по Твиттеру!"
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
 msgid "Twitter settings saved."
-msgstr ""
+msgstr "У�тановки Твиттера �охранены."
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:395
 msgid "That is not your Twitter account."
-msgstr ""
+msgstr "Это не Ваш �чёт Твиттера."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
 msgid "Couldn't remove Twitter user."
-msgstr ""
+msgstr "�е удаёт�� удалить Твиттер-пользовател�."
 
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
 msgid "Twitter account removed."
-msgstr ""
+msgstr "Твиттер-�чёт удалён."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:428 actions/twittersettings.php:439
+#: actions/twittersettings.php:453
 msgid "Couldn't save Twitter preferences."
-msgstr ""
+msgstr "�е удаёт�� �охранить предпочтени� Твиттера."
 
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
 msgid "Twitter preferences saved."
-msgstr ""
+msgstr "Предпочтени� Твиттера �охранены."
 
-#: actions/userauthorization.php:84
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
-msgstr ""
+msgstr "Дл� уверенно�ти проверьте �ти подробно�ти"
 
-#: actions/userauthorization.php:324
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
-msgstr ""
+msgstr "Эта подпи�ка авторизована, но не"
 
-#: actions/userauthorization.php:334
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
-msgstr ""
+msgstr "Эта подпи�ка удалена, но не"
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
 msgid "Command results"
-msgstr ""
+msgstr "Команда и�полнена"
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:204
 msgid "Command complete"
-msgstr ""
+msgstr "Команда завершена"
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:215
 msgid "Command failed"
-msgstr ""
+msgstr "Команда неудачна"
 
-#: classes/Command.php:39
+#: classes/Command.php:39 classes/Command.php:44
 msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Про�тите, �та команда ещё не выполнена."
 
-#: classes/Command.php:96
+#: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
-msgstr ""
+msgstr "Подпи�ки: %1$s"
 
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
 msgid "User has no last notice"
-msgstr ""
+msgstr "У пользовател� нет заметок"
 
-#: classes/Command.php:146
+#: classes/Command.php:146 classes/Command.php:166
 msgid "Notice marked as fave."
-msgstr ""
+msgstr "Заметка помечена как любима�."
 
-#: classes/Command.php:166
+#: classes/Command.php:166 classes/Command.php:189
 #, php-format
 msgid "%1$s (%2$s)"
-msgstr ""
+msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169
+#: classes/Command.php:169 classes/Command.php:192
 #, php-format
 msgid "Fullname: %s"
-msgstr ""
+msgstr "Полное им�: %s"
 
-#: classes/Command.php:172
+#: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
-msgstr ""
+msgstr "Ме�то житель�тва: %s"
 
-#: classes/Command.php:175
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
 msgid "Homepage: %s"
-msgstr ""
+msgstr "Домашн�� �траница: %s"
 
-#: classes/Command.php:178
+#: classes/Command.php:178 classes/Command.php:201
 #, php-format
 msgid "About: %s"
-msgstr ""
+msgstr "О пользователе: %s"
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:228
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr ""
+msgstr "Сообщение �лишком длинное - не больше 140 �имволов, Вы по�ылаете %d"
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
-msgstr ""
+msgstr "Пр�мое �ообщение дл� %s по�лано"
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
-msgstr ""
+msgstr "Ошибка при отправке пр�мого �ообщени�."
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:300
 msgid "Specify the name of the user to subscribe to"
-msgstr ""
+msgstr "Определите им� пользовател� при подпи�ке на"
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:307
 #, php-format
 msgid "Subscribed to %s"
-msgstr ""
+msgstr "Подпи�ано на %s"
 
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:328
 msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+msgstr "Определите им� пользовател� дл� отпи�ки от"
 
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "Отпи�ано от %s"
 
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
+#: classes/Command.php:376
 msgid "Command not yet implemented."
-msgstr ""
+msgstr "Команда ещё не выполнена."
 
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:356
 msgid "Notification off."
-msgstr ""
+msgstr "Оповещение от�ут�твует."
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:358
 msgid "Can't turn off notification."
-msgstr ""
+msgstr "�ет оповещени�."
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:379
 msgid "Notification on."
-msgstr ""
+msgstr "Е�ть оповещение."
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:381
 msgid "Can't turn on notification."
-msgstr ""
+msgstr "Е�ть оповещение."
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
-msgstr ""
+msgstr "Команды:"
 
-#: classes/Message.php:53
+#: classes/Message.php:53 classes/Message.php:56
 msgid "Could not insert message."
-msgstr ""
+msgstr "�е удаёт�� в�тавить �ообщение."
 
-#: classes/Message.php:63
+#: classes/Message.php:63 classes/Message.php:66
 msgid "Could not update message with new URI."
-msgstr ""
+msgstr "�е удаёт�� обновить �ообщение � новым URI."
 
 #: lib/gallery.php:46
 msgid "User without matching profile in system."
-msgstr ""
+msgstr "Пользователь без �оответ�твующего профил� в �и�теме."
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:289
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
-msgstr ""
+msgstr "У Ва� новый адре� по�тинга на %1$s."
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:508
 #, php-format
 msgid "New private message from %s"
-msgstr ""
+msgstr "�овое приватное �ообщение от %s"
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:512
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
-msgstr ""
+msgstr "%1$s (%2$s) по�лал Вам приватное �ообщение:"
 
-#: lib/mailbox.php:43
+#: lib/mailbox.php:43 lib/mailbox.php:89
 msgid "Only the user can read their own mailboxes."
-msgstr ""
+msgstr "Только �ам пользователь может читать �об�твенный почтовый �щик."
 
-#: lib/openid.php:195
+#: lib/openid.php:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
-msgstr ""
+msgstr "Это форма дл� автоматиче�кого подтверждени�."
 
-#: lib/personal.php:65
+#: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
-msgstr ""
+msgstr "Любимое"
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
-msgstr ""
+msgstr "%s's любимые заметки"
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
-#: lib/personal.php:75
+#: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
-msgstr ""
+msgstr "Вход�щие"
 
-#: lib/personal.php:76
+#: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
-msgstr ""
+msgstr "Ваши вход�щие �ообщени�"
 
-#: lib/personal.php:80
+#: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
-msgstr ""
+msgstr "И�ход�щее"
 
-#: lib/personal.php:81
+#: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
-msgstr ""
+msgstr "Ваши и�ход�щие �ообщени�"
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
-msgstr ""
+msgstr "Твиттер"
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
-msgstr ""
+msgstr "Опции интеграции � Твиттером"
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgid "To"
-msgstr ""
+msgstr "Дл�"
 
-#: scripts/maildaemon.php:45
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "Could not parse message."
+msgstr "Сообщение не удаёт�� разобрать."
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s и друзь�"
+
+#: actions/avatarsettings.php:76
+#, fuzzy
+msgid "You can upload your personal avatar."
+msgstr "Вы можете обновить зде�ь Вашу личную профильную информацию"
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+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
+#, fuzzy
+msgid "There was a problem with your session token. "
+msgstr "Проблема � Вашей �е��ией. Попробуйте ещё раз, пожалуй�та."
+
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
+
+#: 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
+#, 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
+#, fuzzy
+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 "�е удаёт�� �охранить информацию о блокировании."
+
+#: actions/confirmaddress.php:159
+#, fuzzy, php-format
+msgid "The address \"%s\" has been "
+msgstr "�дре� удалён."
+
+#: actions/deletenotice.php:73
+#, fuzzy
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+"Вы окончательно удал�ете заметку. По�ле того, как �то будет �делано, "
+"во��тановление будет невозможно."
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Добавить в любимые"
+
+#: actions/editgroup.php:54
+#, 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"
+msgstr ""
+
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#, fuzzy
+msgid "You must be logged in to create a group."
+msgstr ""
+"Вы должны авторизовать��, чтобы приглашать других пользователей �ледовать за "
+"%s"
+
+#: 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
+#, fuzzy
+msgid "You must be an admin to edit the group"
+msgstr ""
+"Вы должны авторизовать��, чтобы приглашать других пользователей �ледовать за "
+"%s"
+
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
+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/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "�е удаёт�� обновить пользовател�."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "�а�тройки �охранены."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "В ожидании подтверждени� данного номера телефона."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#, fuzzy
+msgid "Make a new email address for posting to; "
+msgstr "�овый �лектронный адре� дл� по�тинга %s"
+
+#: actions/emailsettings.php:157
+#, fuzzy
+msgid "Send me email when someone "
+msgstr ""
+"По�ылать мне �ообщение по �лектронной почте, е�ли кто-нибудь пошлёт мне "
+"приватное �ообщение."
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+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 ""
+"Код подтверждени� вы�лан на Ваш IM-адре�, который Вы добавили. Вы должны "
+"подтвердить %s дл� ра��ылки �ообщений Вам."
+
+#: 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 ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, 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"
+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/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:72
+#, fuzzy
+msgid "Invitations have been sent to the following users:"
+msgstr "Приглашение(�) ото�лано(ы) �ледующим адре�атам:"
+
+#: actions/facebookinvite.php:96
+#, fuzzy, php-format
+msgid "You have been invited to %s"
+msgstr "Ва� \"подтолкнул\" пользователь %s"
+
+#: 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:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
+msgstr ""
+
+#: actions/facebookremove.php:56
+msgid "Couldn't remove Facebook user."
+msgstr "�е удаёт�� удалить Facebook-пользовател�."
+
+#: actions/facebooksettings.php:65
+#, fuzzy
+msgid "There was a problem saving your sync preferences!"
+msgstr "Проблема � Вашей �е��ией. Попробуйте ещё раз, пожалуй�та."
+
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Предпочтени� �охранены."
+
+#: actions/facebooksettings.php:90
+#, fuzzy
+msgid "Automatically update my Facebook status with my notices."
+msgstr "�втоматиче�ки отправл�ть мои заметки на Твиттер."
+
+#: actions/facebooksettings.php:97
+#, fuzzy
+msgid "Send \"@\" replies to Facebook."
+msgstr "Отправл�ть локальные \"@\"-реплики на Твиттер."
+
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Профиль"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
+msgstr ""
+
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Предпочтени�"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Любимое, что разлюбил"
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+msgid "Popular notices"
+msgstr "Попул�рные заметки"
+
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Попул�рные заметки"
+
+#: actions/favorited.php:79
+#, fuzzy
+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 "О�обые пользователи"
+
+#: actions/featured.php:71
+#, fuzzy, 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/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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "�ватар обновлён."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "�еудача при обновлении аватара."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+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. "
+msgstr ""
+"пои�к людей на %%site.name%% по их имени, ме�ту житель�тва или интере�ам."
+
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "Пои�к людей"
+
+#: actions/imsettings.php:70
+#, fuzzy
+msgid "You can send and receive notices through "
+msgstr "Вы не можете по�лать �ообщение �тому пользователю."
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+#, fuzzy
+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
+#, fuzzy
+msgid "You must be logged in to join a group."
+msgstr ""
+"Вы должны авторизовать��, чтобы приглашать других пользователей �ледовать за "
+"%s"
+
+#: actions/joingroup.php:95
+#, 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 ""
+"�е удаёт�� �ледовать пользователю, т.к. такого пользовател� не �уще�твует."
+
+#: actions/joingroup.php:135
+#, fuzzy, 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
+#, fuzzy
+msgid "You must be logged in to leave a group."
+msgstr ""
+"Вы должны авторизовать��, чтобы приглашать других пользователей �ледовать за "
+"%s"
+
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "�ет такого тега."
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Вы не подпи�аны на �тот профиль."
+
+#: actions/leavegroup.php:100
+#, fuzzy
+msgid "You may not leave a group while you are its administrator."
+msgstr "Вы не можете удал�ть �тату� других пользователей."
+
+#: actions/leavegroup.php:130
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "�е удаёт�� обновить пользователь�кую запи�ь."
+
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr ""
+"�е удаёт�� �ледовать пользователю, т.к. такого пользовател� не �уще�твует."
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "Use this form to create a new group."
+msgstr "При помощи �той формы Вы можете �оздать новый �чёт."
+
+#: actions/newgroup.php:177
+#, fuzzy
+msgid "Could not create group."
+msgstr "�е удаёт�� �оздать любимую заметку."
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "�е удаёт�� �охранить подпи�ку."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "Это �лишком большой файл."
+
+#: actions/newmessage.php:134
+#, fuzzy
+msgid "Don't send a message to yourself; "
+msgstr "Вы не можете по�лать �ообщение �тому пользователю."
+
+#: actions/newnotice.php:166
+msgid "Notice posted"
+msgstr "Заметка опубликована"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
+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/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "�вторизаци� OpenID"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+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
+#, fuzzy
+msgid "Change your password."
+msgstr "Изменить Ваш пароль"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "Пароль �охранён."
+
+#: actions/peopletag.php:35
+#, php-format
+msgid "Not a valid people tag: %s"
+msgstr "�еверный тег человека: %s"
+
+#: actions/peopletag.php:47
+#, 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
+#, fuzzy
+msgid "Profile information"
+msgstr "�еизве�тный профиль"
+
+#: actions/profilesettings.php:124
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+"Теги дл� �амого �еб� (буквы, цифры, -, ., и _), разделенные зап�той или "
+"пробелом"
+
+#: actions/profilesettings.php:144
+#, fuzzy
+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
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Публична� хронологи�"
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
+msgstr "�е удаёт�� вернуть публичный поток."
+
+#: actions/public.php:220
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+"Это �айт %%site.name%%, дл� [микроблогинга](http://en.wikipedia.org/wiki/"
+"Micro-blogging)"
+
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Лента публичного потока"
+
+#: actions/publictagcloud.php:63
+#, 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
+#, fuzzy
+msgid "You can't register if you don't "
+msgstr ""
+"Вы не можете зареги�трировать��, е�ли Вы не подтверждаете лицензионного "
+"�оглашени�."
+
+#: actions/register.php:286
+#, fuzzy
+msgid "With this form you can create "
+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 "�дре� твоей �траницы, дневника или профил� на другом портале"
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Опиши �еб� и �вои увлечени� при помощи 140 �имволов"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "Где Вы находите�ь, например «Город, штат (или обла�ть), �трана»"
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+msgstr ""
+", за и�ключением моих ча�тных данных: парол�, почты, ме��енджера, телефона."
+
+#: actions/register.php:471
+#, fuzzy, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr ""
+"Поздравл�ем, %s! И добро пожаловать на %%%%site.name%%%%. Зде�ь Вы можете ..."
+
+#: actions/register.php:495
+#, fuzzy
+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
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Ответы дл� %s"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s favorite notices, page %d"
+msgstr "%s любимые заметки"
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+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"
+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
+#, fuzzy
+msgid "Group actions"
+msgstr "Другие опции"
+
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Лента заметок дл� %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, 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
+#, fuzzy
+msgid "(None)"
+msgstr "(none)"
+
+#: actions/showgroup.php:370
+msgid "All members"
+msgstr ""
+
+#: actions/showgroup.php:378
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+"Это �айт %%site.name%%, дл� [микроблогинга](http://en.wikipedia.org/wiki/"
+"Micro-blogging)"
+
+#: actions/showmessage.php:98
+#, fuzzy
+msgid "Only the sender and recipient "
+msgstr "Только отправитель и получатель могут читать �то �ообщение."
+
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid "%s, page %d"
+msgstr "Вход�щие дл� %s - �траница %d"
+
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Профиль"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "У пользовател� нет профил�."
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+#, fuzzy
+msgid "User actions"
+msgstr "Другие опции"
+
+#: actions/showstream.php:342
+#, fuzzy
+msgid "Send a direct message to this user"
+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"
+msgstr ""
+
+#: actions/showstream.php:542
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+"Это �айт %%site.name%%, дл� [микроблогинга](http://en.wikipedia.org/wiki/"
+"Micro-blogging)"
+
+#: 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
+#, fuzzy
+msgid "Mobile carrier"
+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
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Подпи�чики"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %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
+#, 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."
+
+#: actions/subscriptions.php:122
+msgid "Jabber"
+msgstr "Jabber"
+
+#: 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 ""
+
+#: actions/tagother.php:33
+msgid "Not logged in"
+msgstr "�е авторизовано"
+
+#: actions/tagother.php:39
+msgid "No id argument."
+msgstr "�ет ID аргумента."
+
+#: actions/tagother.php:65
+#, fuzzy, php-format
+msgid "Tag %s"
+msgstr "Теги"
+
+#: actions/tagother.php:141
+#, fuzzy
+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
+#, fuzzy
+msgid "There was a problem with your session token."
+msgstr "Проблема � Вашей �е��ией. Попробуйте ещё раз, пожалуй�та."
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+"Вы можете помечать тегами только пользователей, на которых подпи�аны или "
+"которые подпи�аны на Ва�."
+
+#: actions/tagother.php:198
+msgid "Could not save tags."
+msgstr "�е удаёт�� �охранить теги."
+
+#: actions/tagother.php:233
+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
+#, php-format
+msgid "Microblog tagged with %s"
+msgstr "Микроблог помеченный дл� %s"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr "�еудача при блокировке пользовател�."
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr "�еудача при разблокировке пользовател�."
+
+#: actions/twitapiusers.php:48
+msgid "Not found."
+msgstr "�е найдено."
+
+#: actions/twittersettings.php:71
+#, fuzzy
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+"Добавьте Ваш �чёт на Твиттере дл� автоматиче�кой отправки Ваших заметок на "
+"Твиттер,"
+
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
+msgstr "Им� Твиттер-пользовател�"
+
+#: actions/twittersettings.php:126
+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 "�е удаёт�� подтвердить данные по �чёту от \"%s\" из Твитера."
+
+#: 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."
+
+#: actions/unsubscribe.php:71
+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 ""
+
+#: classes/Notice.php:104
+msgid "Problem saving notice. Unknown user."
+msgstr "Проблема при �охранении заметки. �еизве�тный пользователь."
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+"Слишком много заметок за �толь короткий �рок; немного передохните и "
+"попробуйте вновь через пару минут."
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr "Вам запрещено по�тить�� на �том �айте (бан)"
+
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "�еудача при обновлении аватара."
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr "Другое"
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr "Другие опции"
+
+#: lib/action.php:130
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "О проекте"
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "Изменить Ваш пароль"
+
+#: 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"
+msgstr ""
+
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Создать новую учетную запи�ь"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "�ет такого OpenID."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Помощь"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "�ова� заметка"
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "�ова� заметка"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "�авигаци� по подпи�кам"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+#, fuzzy
+msgid "All "
+msgstr "В�е"
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Заблокировать пользовател�."
+
+#: lib/blockform.php:153
+msgid "Block"
+msgstr "Блокировать"
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "%s любимые заметки"
+
+#: 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 "%s любимые заметки"
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr "Теги фильтра"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr "В�е"
+
+#: lib/galleryaction.php:137
+msgid "Tag"
+msgstr "Тег"
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr "Выберите тег из выпадающего �пи�ка"
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr "Идти"
+
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "�дре� твоей �траницы, дневника или профил� на другом портале"
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Подпи�ки"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Опиши �еб� и �вои увлечени� при помощи 140 �имволов"
+
+#: lib/groupeditform.php:158
+#, 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"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Выход"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+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
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Страница недо�тупна дл� того типа, который Вы задей�твовали."
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "�вторизаци�"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Сохранить"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "�вторизаци� � Вашим именем и паролем."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Создать новую учетную запи�ь"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s теперь про�матривает твои запи�и на %2$s."
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Ме�то житель�тва: %s"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Домашн�� �траница: %s"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, 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:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s добавил Вашу заметку от %2$s в �о�тав �воих любимых."
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+#, fuzzy
+msgid "From"
+msgstr " из"
+
+#: lib/messageform.php:110
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Удалить заметку"
+
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "По�лать \"подталкивание\""
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 или больше знаков"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "в ответ на..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "�е удаёт�� удалить �ту заметку."
+
+#: lib/noticelist.php:451
+#, 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
+#, fuzzy
+msgid "Nudge this user"
+msgstr "\"Подталкивание\" по�лано"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Nudge"
+msgstr "\"Подталкивание\" по�лано"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "Вы не можете по�лать �ообщение �тому пользователю."
+
+#: lib/personaltagcloudsection.php:56
+#, fuzzy, php-format
+msgid "Tags in %s's notices"
+msgstr "У пользовател� нет заметок"
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr "(none)"
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Публичное"
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
+msgstr "По�ледние теги"
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr "О�обое"
+
+#: lib/publicgroupnav.php:90
+msgid "Popular"
+msgstr "Попул�рное"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Заметки"
+
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "�айти человека на �том �айте"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Удалить подпи�ку"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Подпи�ано на %s"
+
+#: lib/subgroupnav.php:97
+#, 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"
+msgstr "В �той форме ты можешь пригла�ить друзей и коллег на �тот �ерви�."
+
+#: lib/subs.php:53
+msgid "User has blocked you."
+msgstr "Пользователь заблокировал Ва�."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Подпи�ано на %s"
+
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+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
+#, fuzzy
+msgid "Unsubscribe from this user"
+msgstr "Отпи�ано от %s"
+
+#~ msgid "Code not yet ready."
+#~ msgstr "Код ещё не готов."
+
+#~ msgid "Export and delete your user information."
+#~ msgstr "Эк�порт и удаление Вашей пользователь�кой информации."
+
+#~ msgid "Delete my account"
+#~ msgstr "Удалить мой �чёт"
+
+#~ msgid "Delete my account confirmation"
+#~ msgstr "Подтверждение удалени� моего �чёта"
+
+#~ msgid "Check if you are sure you want to delete your account."
+#~ msgstr "Пометьте, е�ли уверены, что хотите удалить ваш �чёт."
+
+#~ msgid "Showing recently popular notices"
+#~ msgstr "Показ по�ледних попул�рных заметок"
+
+#~ msgid "Tag a person"
+#~ msgstr "Тег пользовател�"
+
+#~ msgid "List"
+#~ msgstr "Спи�ок"
+
+#~ msgid "Icons"
+#~ msgstr "Иконки"
+
+#~ msgid ""
+#~ "Hey, %s.\n"
+#~ "\n"
+#~ "Someone just entered this email address on %s.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Привет, %s.\n"
+#~ "Кто-то добавил �тот �лектронный адре� дл� %s."
diff --git a/locale/sv_SE/LC_MESSAGES/laconica.mo b/locale/sv_SE/LC_MESSAGES/laconica.mo
index 0c11e0867..c0e8c4d88 100644
--- a/locale/sv_SE/LC_MESSAGES/laconica.mo
+++ b/locale/sv_SE/LC_MESSAGES/laconica.mo
diff --git a/locale/sv_SE/LC_MESSAGES/laconica.po b/locale/sv_SE/LC_MESSAGES/laconica.po
index 0b73e98fa..209149490 100644
--- a/locale/sv_SE/LC_MESSAGES/laconica.po
+++ b/locale/sv_SE/LC_MESSAGES/laconica.po
@@ -6,46 +6,109 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Sök i strömmen efter \"%s\""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../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."
+" 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/subscribe.php:84
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr "från"
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:347
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr "%1$s / Uppdateringar med svar till %2$s"
+
+#: ../actions/invite.php:168 actions/invite.php:176 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/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"
+
+#: ../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/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -60,545 +123,1038 @@ msgstr ""
 "\tHälsningar,\n"
 "%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../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 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"
 
-#: ../actions/publicrss.php:60
+#: ../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 Publik Ström"
 
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#: ../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 med vänner"
 
-#: ../lib/util.php:233
+#: ../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
+#, 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"
+msgstr "%s tidslinje"
+
+#: ../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/register.php:213
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
-"**%%site.name%%** är en mikroblogg service för dig ifrån "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)"
+"(Du kommer få ett meddelande med email inom kort med instruktioner hur du "
+"bekräftar din emailadress)"
 
-#: ../lib/util.php:235
+#: ../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%%)"
+
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** är en mikroblogg service."
 
-#: ../lib/util.php:250
+#: ../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/register.php:176
+#: 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/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste fyllas "
+"i."
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
 msgstr "Minst 6 tecken"
 
-#: ../actions/recoverpassword.php:165
+#: ../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/imsettings.php:188
+#: ../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/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
 "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."
 
-#: ../lib/util.php:296
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"En bekräftelsekod har skickats ut till email adressen du fyllde i. "
+"Kontrollera din inbox (och spamlådan!) efter kod och instruktioner hur du "
+"använder den."
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"En bekräftelsekod har skickats ut till telefonnumret du fyllde i. "
+"Kontrollera din inbox (och spamlådan!) efter kod och instruktioner hur du "
+"använder den."
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55 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 "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/twitapilaconica.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:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "Acceptera"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "Lägg till OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
+msgid "Add or remove OpenIDs"
+msgstr "Lägg till eller tabort 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 "Adress"
 
-#: ../actions/showstream.php:254
+#: ../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/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:422
 msgid "All subscriptions"
 msgstr "Alla prenumerationer"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
 #, php-format
 msgid "All updates for %s"
 msgstr "%s alla uppdateringar"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, 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:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "Det finns redan en prenumeration!"
 
-#: ../actions/userauthorization.php:76
+#: ../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:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logga in automatiskt i framtiden; Ej för publika datorer!"
 
-#: ../actions/avatar.php:32
+#: ../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/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "Användarbilden uppdaterad."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"Väntar bekräftelse på denna adress. Kontrollera ditt Jabber/GTalk konto "
-"för vidare instruktioner. (La du till %s i din vännerlista?)"
+"Väntar bekräftelse på denna adress. Kontrollera ditt Jabber/GTalk konto för "
+"vidare instruktioner. (La du till %s i din vännerlista?)"
 
-#: ../lib/util.php:1136
+#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"Väntar bekräftelse på denna adress. Kontrollera din inbox (och spamlådan!) "
+"efter meddelande om vidare instruktioner."
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+#: actions/smssettings.php:111
+msgid "Awaiting confirmation on this phone number."
+msgstr "Väntar bekräftelse på detta telefonnummer. "
+
+#: ../lib/util.php:1318 lib/util.php:1452
+#, fuzzy
 msgid "Before »"
 msgstr "Tidigare »"
 
-#: ../actions/profilesettings.php:52
+#: ../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/profilesettings.php:93 ../actions/updateprofile.php:102
+#: ../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/updateprofile.php:118
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+msgid "Can't delete this notice."
+msgstr "Kan inte tabort detta inlägg."
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
+#: actions/updateprofile.php:123
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Kan inte läsa användarbild URL '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+#: ../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 nya lösenordet."
 
-#: ../actions/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../lib/openid.php:121
+#: ../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/imsettings.php:154
+#: ../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/password.php:45
+#: ../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/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "Ändra"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr "Ändra email hantering"
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Byt lösenord"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+msgid "Change your password"
+msgstr "Ändra ditt lösenord"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: lib/accountsettingsaction.php:105
+msgid "Change your profile settings"
+msgstr "Ändra dina profil inställningar"
+
+#: ../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/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Bekräfta adress"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "Verifikation avbruten"
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr "Bekräftelsekod"
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Verifikation koden finns ej."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+"Grattis, %s! Välkommen till %%%%site.name%%%%. Härifrån, kanske du vill...\n"
+"\n"
+"* Gå till [din profil](%s) och göra ditt första inlägg.\n"
+"* Lägg till en [Jabber/GTalk adress](%%%%action.imsettings%%%%) så du kan "
+"skicka inlägg med en IM klient.\n"
+"* [Sök efter personer](%%%%action.peoplesearch%%%%) som du kanske känner "
+"eller delar dina intressen. \n"
+"* Uppdatera din [profil inställning](%%%%action.profilesettings%%%%) för att "
+"berätta lite mer om dig själv för andra här. \n"
+"* Läs igenom [online dok](%%%%doc.help%%%%) efter funktioner som du kanske "
+"missat. \n"
+"\n"
+"Tack för att du registrerade dig och vi hoppas du kommer trivas med denna "
+"service."
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "Anslut"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "Anslut till existerande konto"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Kontakta"
 
-#: ../lib/openid.php:178
+#: ../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"
 
-#: ../lib/openid.php:160
+#: ../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/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow user: User not found."
+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:161
+#: ../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:154
+#: ../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"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Kunde inte bekräfta epost"
+#: ../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/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Kunde inte skapa prenumeration."
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: 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."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
 msgstr "Kunde inte radera prenumerationen. "
 
-#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
+#: ../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/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: 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/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/profilesettings.php:175
+#: ../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/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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/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/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/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Skapa"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "Skapa ett nytt konto"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../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/imsettings.php:45
+#: ../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/showstream.php:337
+#: ../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/emailsettings.php:44 actions/emailsettings.php:45
+#: actions/emailsettings.php:99
+msgid "Current confirmed email address."
+msgstr "Nuvarande bekräftade emailadress."
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
 msgstr "Just nu"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "DB error vid infog av hashtag: %s"
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Databasfel för svar: %s"
 
-#: ../actions/profilesettings.php:54
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+#: actions/deletenotice.php:79
+msgid "Delete notice"
+msgstr "Tabort inlägg"
+
+#: ../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/register.php:181
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "Epost"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Epostadress"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
+msgid "Email Address"
+msgstr "Emailadress"
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Email inställningar"
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
 msgid "Email address already exists."
 msgstr "Epostadressen finns redan."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
 msgstr "Bekräfta epostadress"
 
-#: ../actions/recoverpassword.php:176
+#: ../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/invite.php:129 actions/invite.php:137 actions/invite.php:174
+msgid "Email addresses"
+msgstr "Emailadresser"
+
+#: ../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/userauthorization.php:136 ../actions/userauthorization.php:137
-#: actions/userauthorization.php:144
+#: ../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/userauthorization.php:137 actions/userauthorization.php:144
+#: actions/userauthorization.php:161
 msgid "Error authorizing token"
 msgstr "Felaktig bekräftelse av token"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../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/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+#: actions/finishaddopenid.php:126
 msgid "Error connecting user."
 msgstr "Lyckades inte ansluta användaren."
 
 #: ../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/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/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Fel uppstog när inlägget skulle läggas till"
-
 #: ../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/recoverpassword.php:201
+#: ../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/userauthorization.php:139
+#: ../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/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../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."
 
-#: ../lib/openid.php:237
+#: ../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/password.php:80
+#: ../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/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 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/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
 msgid "Error updating profile"
 msgstr "Fel uppstog vid uppdatering av profilen"
 
 #: ../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/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+#: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
 msgstr "Fel uppstog med bekräftelsekoden."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "Nuvarande smeknamn"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "Frågor & svar"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "Uppdatering av profilbild misslyckades."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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/replies.php:61 ../actions/repliesrss.php:80
+#: ../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/login.php:118
+#: ../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"
+
+#: ../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"
+
+#: ../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/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Av säkerhetsskäl, var vänlig skriv in ditt användarnamn och lösenord "
-"innan du ändrar dina inställningar."
-
-#: ../actions/profilesettings.php:44
+"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:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "Hem"
 
-#: ../actions/profilesettings.php:49
+#: ../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/profilesettings.php:87
+#: ../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/imsettings.php:61
+#: ../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."
+
+#: ../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 adress"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "IM inställningar"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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 ""
-"Om du redan har ett konto, logga in med ditt användarnamn och lösenord "
-"för att koppla det till ditt OpenID"
+"Om du redan har ett konto, logga in med ditt användarnamn och lösenord för "
+"att koppla det till ditt OpenID"
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Om du vill lägga till OpenID till ditt konto, fyll i fältet nedan och "
-"tryck på \"Add\""
+"Om du vill lägga till OpenID till ditt konto, fyll i fältet nedan och tryck "
+"på \"Add\""
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"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."
+"Om du glömt eller tappat bort ditt lösenord så kan du få ett nytt skickat "
+"till den emailadress du sparat till ditt konto."
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+#: actions/emailsettings.php:127 actions/smssettings.php:140
+msgid "Incoming email"
+msgstr "Inkommande email"
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:443
+msgid "Incoming email address removed."
+msgstr "Inkommande emailadress borttagen."
 
-#: ../actions/password.php:69
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153
 msgid "Incorrect old password"
 msgstr "Felaktigt, gammalt lösenord"
 
-#: ../actions/login.php:63
+#: ../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/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Instruktioner om hur du återställer ditt lösenord har sänts till din "
-"e-postadress "
+"Instruktioner om hur du återställer ditt lösenord har sänts till din e-"
+"postadress "
 
-#: ../actions/updateprofile.php:113
+#: ../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/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Ogiltig emailadress: %s"
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ogiltig hemsideadress '%s'"
 
-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Ogiltig licens URL '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../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: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:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "Ogiltig inlägg url"
 
-#: ../actions/updateprofile.php:86
+#: ../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/remotesubscribe.php:96
+#: ../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/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/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Felaktig storlek"
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
 msgid "Invalid username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
-#: ../lib/util.php:237
+#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+msgid "Invitation(s) sent"
+msgstr "Inbjudan(ar) skickad"
+
+#: ../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:"
+
+#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
+#: lib/subgroupnav.php:103
+msgid "Invite"
+msgstr "Bjud in"
+
+#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+msgid "Invite new users"
+msgstr "Bjud in nya användare"
+
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, php-format
 msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Det drivs med [Laconica](http://laconi.ca/) mikroblogging software, version "
-"%s, tillgängligt under [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Det drivs med [Laconica](http://laconi.ca/) mikroblogging software, version %"
+"s, tillgängligt under [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../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/imsettings.php:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -607,339 +1163,627 @@ msgstr ""
 "Jabber eller GTalk adress liknande \"användare@exempel.se\". Först se till "
 "att lägga till %s i din vännerlista i IM klienten eller GTalk."
 
-#: ../actions/profilesettings.php:55
+#: ../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)."
+msgstr "Språket är för långt(max 50 tecken)."
+
+#: ../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/profilesettings.php:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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/login.php:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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/openidlogin.php:44
+#: ../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/login.php:122
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
-"Logga in med ditt användarnamn och lösenord. Har du inget användarnamn "
-"ännu? [Registrera](%%action.register%%) ett nytt konto, eller testa "
-"[OpenID](%%action.openidlogin%%)."
+"Logga in med ditt användarnamn och lösenord. Har du inget användarnamn ännu? "
+"[Registrera](%%action.register%%) ett nytt konto, eller testa [OpenID](%%"
+"action.openidlogin%%)."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Logga ut"
 
-#: ../actions/login.php:106
+#: ../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/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/showstream.php:281
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "Skapa en ny emailadress för att posta till, avaktiverar den gamla"
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: 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/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "Mikroblogg av %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+"Mobiloperatör för din telefon. Vet du nån operatör som kan taemot SMS över "
+"email som inte finns med i listan, skicka ett email till oss och tala det "
+"hit %s"
+
+#: ../actions/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/finishopenidlogin.php:71
+#: ../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"
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:465
+msgid "New incoming email address added."
+msgstr "Ny inkommande emailadress inlagd."
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+#: actions/finishopenidlogin.php:99
 msgid "New nickname"
 msgstr "Nytt användarnamn"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "Nytt inlägg"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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/recoverpassword.php:275
+#: ../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/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../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/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59
+#: ../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/finishopenidlogin.php:165 ../actions/profilesettings.php:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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."
+"Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
 msgstr "Inget giltigt smeknamn."
 
-#: ../actions/remotesubscribe.php:72
+#: ../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/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "Smeknamn eller epost"
 
-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
+msgid "No"
+msgstr "Nej"
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
+#: actions/imsettings.php:279
 msgid "No Jabber ID."
 msgstr "Inget Jabber ID."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "Ingen rättighet förfrågan!"
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+#: actions/smssettings.php:299
+msgid "No carrier selected."
+msgstr "Ingen operatör vald."
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+#: actions/smssettings.php:486
+msgid "No code entered"
+msgstr "Ingen kod är ifylld"
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
+#: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "Ingen bekräftelsekod."
 
-#: ../actions/newnotice.php:49
+#: ../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/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:304
+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:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:430
+msgid "No incoming email address."
+msgstr "Ingen inkommande 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/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
 msgstr "Inget användarnamn"
 
-#: ../actions/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: 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/smssettings.php:176 actions/smssettings.php:184
+#: actions/smssettings.php:294
+msgid "No phone number."
+msgstr "Inget telefonnummer."
+
 #: ../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/recoverpassword.php:189
+#: ../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/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
 msgid "No request found!"
 msgstr "Ingen begäran funnen!"
 
 #: ../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/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "Ingen storlek"
 
-#: ../actions/openidsettings.php:135
+#: ../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/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/openidsettings.php:135 actions/openidsettings.php:144
+#: actions/openidsettings.php:222
 msgid "No such OpenID."
 msgstr "Det existerar inget sådant OpenID"
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "Inget sådant dokument."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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 "Inget sådant inlägg."
 
-#: ../actions/recoverpassword.php:56
+#: ../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: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:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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"
 
-#: ../lib/gallery.php:76
+#: ../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."
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Finns inget att visa!"
 
-#: ../actions/recoverpassword.php:60
+#: ../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/imsettings.php:158
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Inte registrerad användare."
+
+#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
+#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
+#: lib/twitterapi.php:502 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/imsettings.php:167 actions/imsettings.php:175
+#: actions/imsettings.php:290
 msgid "Not a valid Jabber ID"
 msgstr "Det är inget giltigt Jabber ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "Det är inget giltigt OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:315
+msgid "Not a valid email address"
+msgstr "Ingen giltig emailadress"
+
+#: ../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/profilesettings.php:83 ../actions/register.php:61
+#: ../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/remotesubscribe.php:118
+#: ../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/remotesubscribe.php:111
+#: ../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/remotesubscribe.php:104
+#: ../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/avatar.php:95
+#: ../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/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "Inte tillstånd ännu."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "Väntade mig inte detta svar!"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/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/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "Ingen prenumerant!"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Inlägg sökning"
+
+#: ../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/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:94
 msgid "Notice has no profile"
 msgstr "Inlägget har ingen profil"
 
-#: ../actions/showstream.php:297
+#: ../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/password.php:39
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "Gammalt lösenord"
 
-#: ../lib/util.php:288
+#: ../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: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: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/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:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID misslyckades: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "OpenID inställningar"
 
-#: ../actions/avatar.php:84
+#: ../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/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "Bitvis uppladdad."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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/recoverpassword.php:249
+#: ../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/recoverpassword.php:245
+#: ../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/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../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/password.php:89 ../actions/recoverpassword.php:274
+#: ../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/password.php:61 ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Personer"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Personer sökning"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Sökning personer"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr "Personligt meddelande"
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Telefonnummer, inga punkter eller mellanslag, med landskod"
+
+#: ../actions/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, "
@@ -949,91 +1793,156 @@ msgstr ""
 "prenumerera på denna användares inlägg. Om du inte frågade efter att "
 "prenumerera på någons inlägg, klicka på \"Cancel\""
 
-#: ../actions/imsettings.php:74
+#: ../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/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "Inställningar sparade."
 
-#: ../lib/util.php:300 ../lib/util.php:328 lib/util.php:344
+#: ../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"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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/stream.php:54
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "Profil URL"
 
-#: ../actions/profilesettings.php:34
+#: ../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:51
+#: ../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"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Publik"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Publik ström"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "Publik tidslinje"
 
-#: ../actions/recoverpassword.php:151
+#: ../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/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/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr "Tidigare taggar"
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr "Återställ"
 
-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198
 msgid "Recover password"
 msgstr "Återställ lösenord"
 
-#: ../actions/recoverpassword.php:67
+#: ../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/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: 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/userauthorization.php:119
+#: ../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/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr "Registreringen är genomförd"
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "Avvisa"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../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/updateprofile.php:69
+#: ../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/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "Fjärrprenumerera"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: 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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "Ta bort OpenID"
 
@@ -1042,43 +1951,85 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Tar du bort din OpenID så gör du det omöjligt att logga in! Om du "
-"behöver ta bort den, lägg till en annan OpenID först."
+"Tar du bort din OpenID så gör du det omöjligt att logga in! Om du behöver ta "
+"bort den, lägg till en annan OpenID först."
 
-#: ../lib/stream.php:49
+#: ../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:50
+#: ../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 "Svarat på %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "Återställ"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "Återställ lösenord"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr "SMS Telefonnummer"
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS Inställningar"
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr "SMS Bekräftelse"
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
 msgid "Same as password above"
 msgstr "Samma som lösenordet ovan"
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../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/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"
 
-#: ../lib/searchaction.php:73 ../lib/util.php:277
+#: ../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/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "Sök strömflöde"
 
-#: ../actions/noticesearch.php:30
+#: ../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 "
@@ -1093,118 +2044,248 @@ 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. "
+"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"
 
-#: ../lib/util.php:982
+#: ../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/imsettings.php:71
+#: ../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."
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
+#: actions/imsettings.php:137
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Skicka inlägg till mig via Jabber/GTalk."
 
-#: ../lib/util.php:282
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Skicka inlägg till mig via SMS; Jag är införstådd att min operatör kan "
+"debitera mig."
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"Skicka svar till mig via Jabber/GTalk från personer som inte jag "
+"prenumererar på."
+
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr "Inställningar"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "Inställningar sparade."
 
-#: ../actions/finishaddopenid.php:66
+#: ../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."
 
-#: ../lib/util.php:302
+#: ../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:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "Statistik"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../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:172
-#: ../actions/showstream.php:181
+#: ../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:294 ../actions/subscribers.php:27
+#: ../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:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "Prenumeration accepterad"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "Prenumeration avvisad"
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../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/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
 msgid "System error uploading file."
 msgstr "Systemfel när filen laddades upp."
 
-#: ../actions/noticesearch.php:34
+#: ../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: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:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "Den adressen har redan blivit bekräftad en gång."
 
-#: ../actions/confirmaddress.php:43
+#: ../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/avatar.php:80
+#: ../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/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:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr "Det är redan din Jabber ID."
 
-#: ../actions/imsettings.php:224
+#: ../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/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:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr "Det är inte ditt Jabber ID."
 
-#: ../actions/imsettings.php:201
+#: ../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/newnotice.php:52
+#: ../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/confirmaddress.php:86
+#: ../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/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adressen \"%s\" har blivit bekräftad för ditt konto."
 
-#: ../actions/imsettings.php:241
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413
 msgid "The address was removed."
 msgstr "Adressen är borttagen."
 
-#: ../actions/userauthorization.php:311 ../actions/userauthorization.php:312
+#: ../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 "
@@ -1214,7 +2295,7 @@ msgstr ""
 "med sidans instruktioner hur du bekräftar en prenumeration. Din "
 "prenumerering token är:"
 
-#: ../actions/userauthorization.php:321 ../actions/userauthorization.php:322
+#: ../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 "
@@ -1223,25 +2304,32 @@ msgstr ""
 "Prenumerationen har blivit avvisad, men inga URL har gått igenom. Kolla med "
 "sidans instruktioner hur du avvisar en prenumeration."
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Dessa personer är dom som lyssnar på %s inlägg."
 
-#: ../actions/subscribers.php:33
+#: ../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/subscriptions.php:35
+#: ../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/subscriptions.php:33
+#: ../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/recoverpassword.php:87
+#: ../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 ""
+"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."
 
@@ -1250,62 +2338,105 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Detta formulär skall automatiskt skicka själv. Om den inte gör det, "
-"klicka på skicka för att gå dit där du skapade ditt OpenID."
+"Detta formulär skall automatiskt skicka själv. Om den inte gör det, klicka "
+"på skicka för att gå dit där du skapade ditt OpenID."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../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 ""
-"Detta är första gången du loggade in till %s så vi måste koppla sitt "
-"OpenID till ett lokalt konto. Du kan antingen skapa ett nytt konto eller med "
-"ett existerande konto, om du har något."
+"Detta är första gången du loggade in till %s så vi måste koppla sitt OpenID "
+"till ett lokalt konto. Du kan antingen skapa ett nytt konto eller med ett "
+"existerande konto, om du har något."
 
-#: ../lib/util.php:147
+#: ../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."
+
+#: ../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."
+
+#: ../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/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138
+msgid "Timezone"
+msgstr "Tidszon"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr "Du har inte valt tidszon"
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
-"För att prenumerera så kan du [logga in](%%action.login%%) eller "
-"[registrera](%%action.register%%) ett nytt konto. Om du redan har ett konto "
-"på en [kompatibel mikroblogg sida](%%doc.openmublog%%) fyll i din profils "
-"URL nedan."
+"För att prenumerera så kan du [logga in](%%action.login%%) eller [registrera]"
+"(%%action.register%%) ett nytt konto. Om du redan har ett konto på en "
+"[kompatibel mikroblogg sida](%%doc.openmublog%%) fyll i din profils URL "
+"nedan."
+
+#: ../actions/twitapifriendships.php:163 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/profilesettings.php:51
+#: ../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/remotesubscribe.php:74
+#: ../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/imsettings.php:105 ../actions/recoverpassword.php:39
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/smssettings.php:135 actions/emailsettings.php:144
-#: actions/imsettings.php:118 actions/recoverpassword.php:39
-#: actions/smssettings.php:143 actions/twittersettings.php:108
+#: ../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/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323
 msgid "Unexpected password reset."
 msgstr "Oväntad rensning av lösenord."
 
+#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+msgid "Unknown action"
+msgstr "Okänd funktion"
+
 #: ../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."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1313,24 +2444,52 @@ msgstr ""
 "Om inget annat anges, innehåll på denna sida skyddas utav copyright ifrån "
 "användarna och tillgängliga under"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Adresstypen känns inte igen %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Lämnar pren."
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../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/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr "Bildfilens format stödjs inte."
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr "Uppdateringar via SMS"
+
+#: ../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/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/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/avatar.php:68 actions/profilesettings.php:161
+#: actions/avatarsettings.php:162 actions/grouplogo.php:232
 msgid "Upload"
 msgstr "Ladda upp"
 
@@ -1341,66 +2500,136 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Ladda upp en ny \"avatar\" (användarbild) här. Du kan inte göra "
-"ändringar i bilden efter uppladdning, försök att se till att den är så "
-"fykantig som möjligt. Den måste följa licensvillkoren, använd en bild "
-"som du äger och som du vill dela med dig utav."
+"Ladda upp en ny \"avatar\" (användarbild) här. Du kan inte göra ändringar i "
+"bilden efter uppladdning, försök att se till att den är så fykantig som "
+"möjligt. Den måste följa licensvillkoren, använd en bild som du äger och som "
+"du vill dela med dig utav."
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr "Ladda upp en ny profilbild"
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../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 ""
+"Använd detta formulär för att bjuda in dina vänner och kollegor till denna "
+"sida."
+
+#: ../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 ""
-"Används endast för uppdateringar, annonsering och återställning av "
-"lösenord"
+"Används endast för uppdateringar, annonsering och återställning av lösenord"
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
 msgid "User being listened to doesn't exist."
 msgstr "Användaren som avlyssnas existerar inte."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../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/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "Användarens smeknamn"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr "Användare hittades inte."
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr "Vilken tidszon befinner du dig normalt?"
+
+#: ../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/profilesettings.php:57
+#: ../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/updateprofile.php:127
+#: ../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/updateprofile.php:122
+#: ../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/finishaddopenid.php:64
+#: ../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!"
 msgstr "Du handhar redan denna OpenID!"
 
-#: ../actions/recoverpassword.php:31
+#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
+msgid ""
+"You are about to permanently delete a notice.  Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Du håller på att tabort inlägget permanent. När det väl är gjort kan du inte "
+"Ã¥ngra dig."
+
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
+#: actions/recoverpassword.php:36
 msgid "You are already logged in!"
 msgstr "Du är redan inloggad!"
 
+#: ../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/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/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Du kan ändra ditt lösenord här. Välj ett bra!"
 
-#: ../actions/register.php:164
+#: ../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/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 kan ta emot SMS meddelande via email från %%site.name%%."
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -1409,44 +2638,88 @@ 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/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"Du kan skicka och ta emot inlägg genom Jabber/GTalk [instant "
-"messages](%%doc.im%%). Konfigurera din adress och inställningar nedan. "
+"Du kan skicka och ta emot inlägg genom Jabber/GTalk [instant messages](%%doc."
+"im%%). Konfigurera din adress och inställningar nedan. "
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"Du kan uppdatera din personliga profil här så personer får veta mer om "
-"dig."
+"Du kan uppdatera din personliga profil här så personer får veta mer om dig."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: 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/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../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/updateprofile.php:62
+#: ../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/recoverpassword.php:134
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+"Du har en ny adress %1$s.\n"
+"\n"
+"Skicka email till %2$s för att göra ett nytt inlägg.\n"
+"\n"
+"Mer information får du på %3$s.\n"
+"\n"
+"Mvh,\n"
+"%4$s"
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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/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/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 ""
+"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/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "Din OpenID URL"
 
-#: ../actions/recoverpassword.php:149
+#: ../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."
 
@@ -1456,862 +2729,85 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"[OpenID](%%doc.openid%%) låter dig logga in på flera sidor med samma "
-"konto. Ställ in ditt OpenID konto härifrån."
+"[OpenID](%%doc.openid%%) låter dig logga in på flera sidor med samma konto. "
+"Ställ in ditt OpenID konto härifrån."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "ett par sekunder sedan"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "för %d dagar sedan"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "för %d timmar sedan"
 
-#: ../lib/util.php:818
+#: ../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"
 
-#: ../lib/util.php:830
+#: ../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"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "för en dag sedan"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "för nån minut sedan"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "för en månad sedan"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "för ett år sedan"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "för en timma sedan"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "svar"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "samma som lösenordet ovan"
 
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "« Nyare"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr "från"
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Uppdateringar med svar till %2$s"
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s har bjudit in dig till %2$s"
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-"%1$s har bjudit in dig till %2$s (%3$s).\n"
-"\n"
-"%2$s är en mikroblogg service som låter dig via sidan hålla direktkontakt "
-"med människor du känner eller intresserar dig.\n"
-"\n"
-"Du kan även dela med dig utav nyheter om dig själv, dina tankar, eller "
-"ditt liv online som känner igen dig. Det är också perfekt för att möta "
-"nya personer som delar ditt intresse.\n"
-"\n"
-"%1$s sa:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Du kan se %1$s's profilsida på %2$s här:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Om du vill prova på denna service, klicka på länken nedan för att "
-"acceptera denna inbjudan.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Om inte, då kan du ignorera detta meddelande. Tack för att du tog dig\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s uppdateringar med svar till uppdatering från %2$s / %3$s."
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr "%s(%s)"
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr "%s publika tidslinje"
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr "%s status"
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr "%s tidslinje"
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr "%s uppdateringar ifrån allihop!"
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-"(Du kommer få ett meddelande med email inom kort med instruktioner hur du "
-"bekräftar din emailadress)"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste "
-"fyllas i."
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-msgstr "6 eller fler tecken. MÃ¥ste fyllas i."
-
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"En bekräftelsekod har skickats ut till email adressen du fyllde i. "
-"Kontrollera din inbox (och spamlådan!) efter kod och instruktioner hur du "
-"använder den."
-
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"En bekräftelsekod har skickats ut till telefonnumret du fyllde i. "
-"Kontrollera din inbox (och spamlådan!) efter kod och instruktioner hur du "
-"använder den."
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
-msgstr "API metoden hittades inte!"
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
-msgstr "API metoden är under uppbyggnad."
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr "Lägg till eller tabort OpenIDs"
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Adresser till vänner att bjuda in (en rad per adress)"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr "Är du säker på att du vill tabort detta inlägg?"
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-"Automatisk prenummeration på den som prenumererar på mig. (Bäst för icke "
-"mänsklig användare) "
-
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"Väntar bekräftelse på denna adress. Kontrollera din inbox (och "
-"spamlådan!) efter meddelande om vidare instruktioner."
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr "Väntar bekräftelse på detta telefonnummer. "
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr "Kan inte tabort detta inlägg."
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr "Kan inte normalisera den emailadressen"
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr "Ändra email hantering"
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr "Ändra ditt lösenord"
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr "Ändra dina profil inställningar"
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr "Bekräftelsekod"
-
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-"Grattis, %s! Välkommen till %%%%site.name%%%%. Härifrån, kanske du "
-"vill...\n"
-"\n"
-"* Gå till [din profil](%s) och göra ditt första inlägg.\n"
-"* Lägg till en [Jabber/GTalk adress](%%%%action.imsettings%%%%) så du kan "
-"skicka inlägg med en IM klient.\n"
-"* [Sök efter personer](%%%%action.peoplesearch%%%%) som du kanske känner "
-"eller delar dina intressen. \n"
-"* Uppdatera din [profil inställning](%%%%action.profilesettings%%%%) för "
-"att berätta lite mer om dig själv för andra här. \n"
-"* Läs igenom [online dok](%%%%doc.help%%%%) efter funktioner som du kanske "
-"missat. \n"
-"\n"
-"Tack för att du registrerade dig och vi hoppas du kommer trivas med denna service."
-
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Kunde inte följa användaren: %s finns redan i din lista."
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr "Kunde inte prenumerera på annat åt dig."
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr "Kunde inte prenumerera."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr "Kunde inte uppdatera användaren med bekräftad emailadress."
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr "Kunde inte få fram status."
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr "Kunde inte uppdatera användaren för automatisk prenumeration."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr "Kunde inte uppdatera användarens inställningar."
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Nuvarande bekäftat SMS telefonnummer"
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr "Nuvarande bekräftade emailadress."
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "DB error vid infog av hashtag: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr "Tabort inlägg"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr "Emailadress"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr "Email inställningar"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Emailadress såsom \"användare@exempel.se\""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr "Emailadresser"
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr "Fyll i koden du mottog i din telefon."
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Feed för taggar %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr "Sök innehåll i inlägg"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr "Sök personer på denna sida"
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr "Jag vill posta inlägg via min email."
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr "IM"
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-"Om du glömt eller tappat bort ditt lösenord så kan du få ett nytt "
-"skickat till den emailadress du sparat till ditt konto."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr "Inkommande email"
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr "Inkommande emailadress borttagen."
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Ogiltig emailadress: %s"
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr "Inbjudan(ar) skickad"
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr "Inbjudan(ar) är skickade till följande personer:"
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr "Bjud in"
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr "Bjud in nya användare"
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr "Språk"
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr "Språket är för långt(max 50 tecken)."
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Långt namn, förslagsvis ditt \"riktiga\" namn"
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr "Skapa en ny emailadress för att posta till, avaktiverar den gamla"
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Ställ in hur du tar emot email ifrån %%site.name%%"
-
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-"Mobiloperatör för din telefon. Vet du nån operatör som kan taemot SMS "
-"över email som inte finns med i listan, skicka ett email till oss och tala "
-"det hit %s"
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr "Ny"
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Ny emailadress för att skicka till %s"
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr "Ny inkommande emailadress inlagd."
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr "Nej"
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr "Ingen operatör vald."
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr "Ingen kod är ifylld"
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr "Ingen emailadress."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr "Ingen inkommande emailadress."
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr "Inget telefonnummer."
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr "Ingen status hittad med det ID"
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr "Ingen status med det ID hittades."
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr "Ingen användare med den emailadressen eller användarnamn."
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr "Inte registrerad användare."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
-msgstr "Ingen support för det formatet."
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr "Ingen giltig emailadress"
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr "Hittades inte"
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr "Inlägg sökning"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Inlägg taggade med %s"
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr "Om du vill, skriv ett personligt meddelande med inbjudan."
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr "Personer"
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr "Personer sökning"
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr "Personligt meddelande"
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Telefonnummer, inga punkter eller mellanslag, med landskod"
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr "Språkval"
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publicera ett MicroID för min Jabber/GTalk adress."
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr "Publicera ett MicroID för min emailadress."
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Tidigare taggar"
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr "Registrering är inte möjlig."
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr "Registreringen är genomförd"
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr "SMS"
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr "SMS Telefonnummer"
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr "SMS Inställningar"
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr "SMS Bekräftelse"
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr "Samma som lösenordet ovan. Måste fyllas i."
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-msgstr "Välj en operatör"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr "Skicka email till denna adress för att posta ett nya inlägg."
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr "Skicka meddelande till mig via email vid nya prenumerationer."
-
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
-"Skicka inlägg till mig via SMS; Jag är införstådd att min operatör kan "
-"debitera mig."
-
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-"Skicka svar till mig via Jabber/GTalk från personer som inte jag "
-"prenumererar på."
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Visar dom populäraste taggarna ifrån den senaste veckan."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr "Ledsen, men inga inkommande email är tillåtna."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr "Ledsen, men det är inte din inkommande emailadress."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr "Taggar"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Text"
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Den emailadressen tillhör redan en annan användare."
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr "Det är redan din emailadress."
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr "Det är redan ditt telefonnummer."
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr "Det är inte din emailadress."
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr "Det är inte ditt telefonnummer."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr "Det är fel nummer i bekräftelsen"
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr "Det numret tillhör en annan användare."
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Det är för långt. Max antal tecken är 255."
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-msgstr ""
-"Dom personerna är redan registrerade användare och du blev nu automatiskt "
-"prenumerant till dom:"
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
-msgstr "Denna metod kräver antingen skicka eller tabort."
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
-msgstr "Denna metod kräver skicka."
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr "Tidszon"
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr "Du har inte valt tidszon"
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Två användarid eller namn måste läggas till."
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr "Okänd funktion"
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr "Uppdateringar via SMS"
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr "Uppdateringar via instant messenger (IM)"
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Uppdateringar från %1$s och vänner på %2$s!"
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Uppdateringar från %1$s på %2$s!"
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Ladda upp en ny profilbild"
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-"Använd detta formulär för att bjuda in dina vänner och kollegor till "
-"denna sida."
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Användare hittades inte."
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr "Vilken tidszon befinner du dig normalt?"
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-msgstr "Ja"
-
-#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-"Du håller på att tabort inlägget permanent. När det väl är gjort kan "
-"du inte ångra dig."
-
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr "Du prenumererar redan på dessa användare:"
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr "Du är inte vän med den användaren."
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Du kan ta emot SMS meddelande via email från %%site.name%%."
-
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-"Du har en ny adress %1$s.\n"
-"\n"
-"Skicka email till %2$s för att göra ett nytt inlägg.\n"
-"\n"
-"Mer information får du på %3$s.\n"
-"\n"
-"Mvh,\n%4$s"
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr "Du kan inte tabort nån annan användares status."
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
-
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-"du kommer bli meddelad när någon du bjudit in accepterar inbjudan och "
-"registrerar sig. Tack för att du hjälper oss växa!"
-
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "Tabort"
-
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: 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
@@ -2321,18 +2817,22 @@ msgstr "okänd fil typ"
 #: 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/disfavor.php:55
+#: actions/disfavor.php:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr "Det inlägget är ingen favorit!"
 
-#: actions/disfavor.php:63
+#: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Kunde inte tabort favoriten."
 
-#: actions/disfavor.php:72
+#: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
 msgstr "Favorisera"
 
@@ -2340,16 +2840,18 @@ msgstr "Favorisera"
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Skicka mig ett email när någon lägger till mitt inlägg som favorit."
 
-#: actions/emailsettings.php:95
+#: 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/favor.php:53 actions/twitapifavorites.php:142
+#: 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/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: 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."
 
@@ -2358,30 +2860,31 @@ msgid "Disfavor"
 msgstr "Avfavorisera"
 
 #: 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/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Feed över %s favoriter"
 
-#: actions/inbox.php:28
+#: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
 msgstr "Inbox för %s - sida %d"
 
-#: actions/inbox.php:30
+#: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 msgstr "Inbox för %s"
 
-#: actions/inbox.php:53
+#: 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/invite.php:178
+#: 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"
@@ -2390,56 +2893,60 @@ msgstr ""
 "%1$s har bjudit in dig till %2$s(%3$s).\n"
 "\n"
 
-#: actions/login.php:104
+#: 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;"
 
-#: actions/login.php:122
+#: 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/login.php:126
+#: 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/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/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:128
 msgid "No recipient specified."
 msgstr "Ingen mottagare tillagd."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: 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/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: 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."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Skicka inte meddelande till dig själv, viska lite tyst istället."
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
 msgid "No such user"
 msgstr "Ingen sådan användare"
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "New message"
 msgstr "Nytt meddelande"
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
 msgstr "Inlägg utan matchande profil"
 
-#: actions/openidsettings.php:28
+#: 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/openidsettings.php:46
+#: 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,"
 
@@ -2447,66 +2954,68 @@ msgstr "Om du vill lägga till en OpenID till ditt konto,"
 msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr "Att tabort ditt enda OpenID skulle göra det omöjligt att logga in!"
 
-#: actions/openidsettings.php:87
+#: 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/outbox.php:28
+#: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr "Outbox för %s - sida %d"
 
-#: actions/outbox.php:30
+#: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Outbox för %s"
 
-#: actions/outbox.php:53
+#: 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/peoplesearch.php:28
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
-"Sök efter personer på %%site.name%% efter deras namn, plats eller "
-"intressen."
+"Sök efter personer på %%site.name%% efter deras namn, plats eller intressen."
 
-#: actions/profilesettings.php:27
+#: 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"
 
 #: 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/recoverpassword.php:91
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
 msgstr "Denna bekräftelsekod är för gammal."
 
-#: actions/recoverpassword.php:141
+#: 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/recoverpassword.php:154
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
 msgstr "Du är identifierad. Skriv in"
 
-#: actions/recoverpassword.php:169
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
 msgstr "Ditt smeknamn på denna server,"
 
-#: actions/recoverpassword.php:271
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
 msgstr "Instruktioner för att återfå ditt lösenord"
 
-#: actions/recoverpassword.php:327
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
 msgstr "Nya lösenordet är sparat."
 
-#: actions/register.php:95
+#: 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."
 
@@ -2516,28 +3025,28 @@ msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
-"Gratulerar, %s! Välkommen till %%%%site.name%%%%. Härifrån vill du "
-"kanske..."
+"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: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/showfavorites.php:61
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Feed för %s favoriter"
 
 #: 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/showmessage.php:33
+#: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
 msgstr "Inget sådant meddelande."
 
@@ -2545,12 +3054,12 @@ msgstr "Inget sådant meddelande."
 msgid "Only the sender and recipient may read this message."
 msgstr "Endast den som skickat och mottagaren kan läsa detta meddelande."
 
-#: actions/showmessage.php:61
+#: 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/showmessage.php:66
+#: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Meddelande från %1$s på %2$s"
@@ -2559,65 +3068,71 @@ msgstr "Meddelande från %1$s på %2$s"
 msgid "Send a message"
 msgstr "Skicka ett meddelande"
 
-#: actions/smssettings.php:312
+#: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
 msgstr "Mobiloperatören för din telefon."
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direktmeddelande till %s"
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Alla direktmeddelanden skickade till %s"
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
 msgid "Direct Messages You've Sent"
 msgstr "Direktmeddelanden du skickat"
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #, 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."
 msgstr ""
-"Kan inte skicka direktmeddelanden till användare som inte är dina "
-"vänner."
+"Kan inte skicka direktmeddelanden till användare som inte är dina vänner."
 
-#: actions/twitapifavorites.php:92
+#: 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:95 actions/twitapifavorites.php:69
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s uppdaterade favoriter av %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 la till ditt inlägg som favorit"
 
 #: 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 just in ditt inlägg ifrån %2$s som en av deras favorit.\n\n"
+msgstr ""
+"%1$s la just in ditt inlägg ifrån %2$s som en av deras favorit.\n"
+"\n"
 
 #: actions/twittersettings.php:27
 msgid ""
@@ -2626,15 +3141,15 @@ msgstr ""
 "Lägg till ditt Twitter konto för att automatiskt skicka dina inlägg till "
 "Twitter,"
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
 msgstr "Twitter inställningar"
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
 msgstr "Twitter konto"
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
 msgstr "Verifierat Twitter konto."
 
@@ -2642,7 +3157,7 @@ msgstr "Verifierat Twitter konto."
 msgid "Twitter Username"
 msgstr "Twitter användarnamn"
 
-#: actions/twittersettings.php:65
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgid "No spaces, please."
 msgstr "Inga mellanslag tack."
 
@@ -2650,15 +3165,15 @@ msgstr "Inga mellanslag tack."
 msgid "Twitter Password"
 msgstr "Twitter lösenord"
 
-#: actions/twittersettings.php:72
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
 msgstr "Skicka automatiskt mina inlägg till Twitter."
 
-#: actions/twittersettings.php:75
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Skicka lokala \"@\" svar till Twitter."
 
-#: actions/twittersettings.php:78
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Subscribe to my Twitter friends here."
 msgstr "Prenumerera på mina Twitter vänner här."
 
@@ -2670,7 +3185,7 @@ 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:128 actions/twittersettings.php:334
 msgid "Could not verify your Twitter credentials!"
 msgstr "Kunde inte verifiera din Twitter!"
 
@@ -2680,160 +3195,166 @@ msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr "Kunde inte mottaga konto information för \"%s\" Twitter."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
 msgid "Unable to save your Twitter settings!"
 msgstr "Kunde inte spara dina Twitter inställningar!"
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
 msgid "Twitter settings saved."
 msgstr "Twitter inställningar sparade."
 
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:395
 msgid "That is not your Twitter account."
 msgstr "Det är inte ditt Twitter konto."
 
 #: 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/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
 msgid "Twitter account removed."
 msgstr "Twitterkontot borttaget."
 
 #: 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/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
 msgid "Twitter preferences saved."
 msgstr ""
 
-#: actions/userauthorization.php:84
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
 msgstr ""
 
-#: actions/userauthorization.php:324
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: actions/userauthorization.php:334
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:204
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:215
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39
+#: classes/Command.php:39 classes/Command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: classes/Command.php:96
+#: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: 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:146 classes/Command.php:166
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166
+#: classes/Command.php:166 classes/Command.php:189
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169
+#: classes/Command.php:169 classes/Command.php:192
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullt namn: %s"
 
-#: classes/Command.php:172
+#: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
 msgstr "Plats: %s"
 
-#: classes/Command.php:175
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hemsida: %s"
 
-#: classes/Command.php:178
+#: classes/Command.php:178 classes/Command.php:201
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:228
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:300
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:307
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: 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:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: 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:313 classes/Command.php:356
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:358
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:379
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:381
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53
+#: classes/Message.php:53 classes/Message.php:56
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63
+#: classes/Message.php:63 classes/Message.php:66
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -2841,74 +3362,1660 @@ msgstr ""
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:289
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:508
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:512
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43
+#: 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:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: lib/personal.php:65
+#: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
 msgstr ""
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
 msgstr ""
 
-#: lib/personal.php:75
+#: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
 msgstr ""
 
-#: lib/personal.php:76
+#: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
 msgstr ""
 
-#: lib/personal.php:80
+#: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
 msgstr ""
 
-#: lib/personal.php:81
+#: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgid "To"
 msgstr ""
 
-#: scripts/maildaemon.php:45
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "Could not parse message."
 msgstr ""
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s med vänner"
+
+#: actions/avatarsettings.php:76
+#, fuzzy
+msgid "You can upload your personal avatar."
+msgstr "Du kan uppdatera din personliga profil här"
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Twitter inställningar"
+
+#: 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
+#, 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/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
+#, fuzzy
+msgid "Lost our file."
+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/block.php:74 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/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "Ingen sådan användare"
+
+#: 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/block.php:162
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Du prenumererar redan på dessa användare:"
+
+#: 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 "Adressen är borttagen."
+
+#: 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/disfavor.php:94
+#, fuzzy
+msgid "Add to favorites"
+msgstr "Feed för %s favoriter"
+
+#: actions/editgroup.php:54
+#, 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"
+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/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 "Ingen sådan användare"
+
+#: 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/editgroup.php:157
+msgid "Use this form to edit the group."
+msgstr ""
+
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
+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/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Kunde inte uppdatera användare."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "Inställningar sparade."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Väntar bekräftelse på detta telefonnummer. "
+
+#: 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/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/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/emailsettings.php:321
+#, fuzzy
+msgid "That email address already belongs "
+msgstr "Den emailadressen tillhör redan en annan användare."
+
+#: actions/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
+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!"
+msgstr ""
+
+#: actions/facebookhome.php:196
+#, php-format
+msgid "If you would like the %s app to automatically update "
+msgstr ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, 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 "Inget innehåll!"
+
+#: 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
+#, fuzzy
+msgid "After"
+msgstr "« Nyare"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#, fuzzy
+msgid "Before"
+msgstr "Tidigare »"
+
+#: actions/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:72
+#, fuzzy
+msgid "Invitations have been sent to the following users:"
+msgstr "Inbjudan(ar) är skickade till följande personer:"
+
+#: actions/facebookinvite.php:96
+#, fuzzy, php-format
+msgid "You have been invited to %s"
+msgstr "Du är identifierad. Skriv in"
+
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "Flöden för $s vänner"
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
+msgstr ""
+
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Kunde inte tabort Twitter användaren."
+
+#: 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/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Inställningar sparade."
+
+#: actions/facebooksettings.php:90
+#, fuzzy
+msgid "Automatically update my Facebook status with my notices."
+msgstr "Skicka automatiskt mina inlägg till Twitter."
+
+#: actions/facebooksettings.php:97
+#, fuzzy
+msgid "Send \"@\" replies to Facebook."
+msgstr "Skicka lokala \"@\" svar till Twitter."
+
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Profil"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
+msgstr ""
+
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Inställningar"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Avfavorisera"
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+#, fuzzy
+msgid "Popular notices"
+msgstr "Inget sådant inlägg."
+
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Inget sådant inlägg."
+
+#: 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."
+
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+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/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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Användarbilden uppdaterad."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Uppdatering av profilbild misslyckades."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+msgstr ""
+
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#, fuzzy
+msgid "Create a new group"
+msgstr "Skapa ett nytt konto"
+
+#: actions/groupsearch.php:57
+#, 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"
+
+#: actions/imsettings.php:70
+#, fuzzy
+msgid "You can send and receive notices through "
+msgstr "Du kan inte skicka meddelande till den användaren."
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk "
+msgstr "Skicka inlägg till mig via Jabber/GTalk."
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Ingen bekräftelsekod."
+
+#: 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/joingroup.php:95
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Du prenumererar redan på dessa användare:"
+
+#: actions/joingroup.php:128
+#, 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/joingroup.php:135
+#, fuzzy, php-format
+msgid "%s joined group %s"
+msgstr "%s / Favoriter från %s"
+
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
+msgstr ""
+
+#: actions/leavegroup.php:65
+#, fuzzy
+msgid "You must be logged in to leave a group."
+msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
+
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+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/leavegroup.php:100
+#, fuzzy
+msgid "You may not leave a group while you are its administrator."
+msgstr "Du kan inte tabort nån annan användares status."
+
+#: actions/leavegroup.php:130
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "Kunde inte uppdatera användarens inställningar."
+
+#: 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/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "Could not create group."
+msgstr "Kunde inte skapa favorit."
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Kunde inte skapa prenumeration."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "Filen är för stor."
+
+#: actions/newmessage.php:134
+#, fuzzy
+msgid "Don't send a message to yourself; "
+msgstr "Du kan inte skicka meddelande till den användaren."
+
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "Inlägg"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
+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/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "OpenID inloggning"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Ta bort OpenID"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Twitter inställningar"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "Sök"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+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/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Ändra ditt lösenord"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "Lösenord är sparat."
+
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Ingen giltig emailadress"
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:91
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "Okänd profil"
+
+#: actions/profilesettings.php:124
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:144
+#, fuzzy
+msgid "Automatically subscribe to whoever "
+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'"
+
+#: actions/profilesettings.php:311
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Kunde inte spara profil."
+
+#: actions/public.php:107
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Publik tidslinje"
+
+#: actions/public.php:173
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "Kunde inte ta emot favoritinläggen."
+
+#: actions/public.php:220
+#, 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 "Publik ström"
+
+#: actions/publictagcloud.php:63
+#, 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
+#, fuzzy
+msgid "You can't register if you don't "
+msgstr "Du kan inte registrera dig om du inte godkänner licensvillkor."
+
+#: actions/register.php:286
+msgid "With this form you can create "
+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"
+
+#: actions/register.php:382 actions/register.php:386
+#, fuzzy
+msgid "Used only for updates, announcements, "
+msgstr ""
+"Används endast för uppdateringar, annonsering och återställning av lösenord"
+
+#: actions/register.php:398
+#, fuzzy
+msgid "URL of your homepage, blog, "
+msgstr "URL till din hemsida, blog eller profil på en annan sida."
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "Var du håller till, såsom \"Stad, Län, Land\""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+msgstr ""
+"förutom det här, som är privat: lösenord, epostadress, IM-adress, "
+"telefonnummer."
+
+#: actions/register.php:471
+#, fuzzy, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr ""
+"Gratulerar, %s! Välkommen till %%%%site.name%%%%. Härifrån vill du kanske..."
+
+#: actions/register.php:495
+#, fuzzy
+msgid "(You should receive a message by email "
+msgstr "(Du kommer inom kort få ett email med"
+
+#: 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 "Svarat på %s"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s favorite notices, page %d"
+msgstr "%s favoriter"
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
+
+#: actions/showgroup.php:206
+#, fuzzy
+msgid "Group profile"
+msgstr "Inget sådant inlägg."
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
+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 "Inlägg"
+
+#: actions/showgroup.php:270
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Inlägg flöde för %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
+msgid "Members"
+msgstr "Medlem sedan"
+
+#: 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/showgroup.php:370
+msgid "All members"
+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 "
+msgstr ""
+
+#: actions/showmessage.php:98
+#, fuzzy
+msgid "Only the sender and recipient "
+msgstr "Endast den som skickat och mottagaren kan läsa detta meddelande."
+
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid "%s, page %d"
+msgstr "Inbox för %s - sida %d"
+
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Profil"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "Användaren har ingen profil."
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+#, fuzzy
+msgid "User actions"
+msgstr "Okänd funktion"
+
+#: actions/showstream.php:342
+#, fuzzy
+msgid "Send a direct message to this user"
+msgstr "Du kan inte skicka meddelande till den användaren."
+
+#: actions/showstream.php:343
+#, fuzzy
+msgid "Message"
+msgstr "Nytt meddelande"
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Prenumerant"
+
+#: actions/showstream.php:533
+msgid "All groups"
+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 "
+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
+#, fuzzy
+msgid "Send me notices through SMS; "
+msgstr "Skicka inlägg till mig via Jabber/GTalk."
+
+#: 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. "
+
+#: actions/smssettings.php:453
+#, fuzzy
+msgid "Mobile carrier"
+msgstr "Välj en operatör"
+
+#: actions/subedit.php:70
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Du skickade inte oss den profilen"
+
+#: actions/subedit.php:83
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Kunde inte skapa prenumeration."
+
+#: actions/subscribe.php:55
+#, fuzzy
+msgid "Not a local user."
+msgstr "Ingen sådan användare"
+
+#: actions/subscribe.php:69
+#, fuzzy
+msgid "Subscribed"
+msgstr "Prenumerera"
+
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Prenumerant"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+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."
+
+#: actions/subscribers.php:67
+#, fuzzy, php-format
+msgid "These are the people who "
+msgstr "Dessa personer är dom som lyssnar på %s inlägg."
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Alla prenumerationer"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Alla prenumerationer"
+
+#: actions/subscriptions.php:65
+#, fuzzy
+msgid "These are the people whose notices "
+msgstr "Detta är personer och inlägg som %s lyssnar på."
+
+#: actions/subscriptions.php:69
+#, fuzzy, php-format
+msgid "These are the people whose "
+msgstr "Dessa personer är dom som lyssnar på %s inlägg."
+
+#: actions/subscriptions.php:122
+#, fuzzy
+msgid "Jabber"
+msgstr "Inget Jabber ID."
+
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Inlägg taggade med %s"
+
+#: actions/tag.php:66
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+msgstr ""
+
+#: actions/tagother.php:33
+#, fuzzy
+msgid "Not logged in"
+msgstr "Inte inloggad."
+
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No id argument."
+msgstr "Inget sådant dokument."
+
+#: actions/tagother.php:65
+#, fuzzy, php-format
+msgid "Tag %s"
+msgstr "Taggar"
+
+#: actions/tagother.php:141
+#, fuzzy
+msgid "Tag user"
+msgstr "Taggar"
+
+#: actions/tagother.php:149
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+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."
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:198
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Kunde inte spara informationen om användarbild"
+
+#: actions/tagother.php:233
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "Inget sådant meddelande."
+
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Inlägg taggade med %s"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "Hittades inte"
+
+#: actions/twittersettings.php:71
+#, fuzzy
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+"Lägg till ditt Twitter konto för att automatiskt skicka dina inlägg till "
+"Twitter,"
+
+#: actions/twittersettings.php:119
+#, fuzzy
+msgid "Twitter user name"
+msgstr "Twitter användarnamn"
+
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Twitter lösenord"
+
+#: actions/twittersettings.php:228
+#, 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."
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Fel uppstog när användaren skulle sparas."
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Ingen profil URL lämnades ut av servern."
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Ingen status hittad med det ID"
+
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Lämnar pren."
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
+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."
+msgstr ""
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Uppdatering av profilbild misslyckades."
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr ""
+
+#: lib/action.php:130
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s(%s)"
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "Om"
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+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"
+msgstr ""
+
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Skapa ett nytt konto"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "Det existerar inget sådant OpenID"
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Hjälp"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "Nytt inlägg"
+
+#: lib/action.php:417
+msgid "Local views"
+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 "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+msgid "All "
+msgstr ""
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Ingen sådan användare"
+
+#: lib/blockform.php:153
+msgid "Block"
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+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/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+#, fuzzy
+msgid "Filter tags"
+msgstr "Feed för taggar %s"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
+
+#: lib/galleryaction.php:137
+#, fuzzy
+msgid "Tag"
+msgstr "Taggar"
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "URL till din hemsida, blog eller profil på en annan sida."
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Prenumerationer"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
+
+#: lib/groupeditform.php:158
+#, 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"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Logga ut"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+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
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Logga in"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Spara"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Logga in med ditt användarnamn och lösenord."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Skapa ett nytt konto"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s lyssnar nu på dina meddelanden i %2$s."
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Plats: %s"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Hemsida: %s"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, fuzzy, php-format
+msgid "You've been nudged by %s"
+msgstr "Du är identifierad. Skriv in"
+
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
+
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr ""
+"%1$s la just in ditt inlägg ifrån %2$s som en av deras favorit.\n"
+"\n"
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+#, fuzzy
+msgid "From"
+msgstr "från"
+
+#: lib/messageform.php:110
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Tabort inlägg"
+
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "Skicka ett meddelande"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "Minst 6 tecken"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "svar till..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Kan inte tabort detta inlägg."
+
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "svar"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Tabort inlägg"
+
+#: lib/noticelist.php:474
+#, fuzzy
+msgid "Delete"
+msgstr "Tabort"
+
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
+msgstr ""
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr ""
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "Du kan inte skicka meddelande till den användaren."
+
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr ""
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Publik"
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#, fuzzy
+msgid "Recent tags"
+msgstr "Tidigare taggar"
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "Personer"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Inlägg"
+
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "Sök personer på denna sida"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Fjärrprenumerera"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Fjärrprenumerera"
+
+#: lib/subgroupnav.php:97
+#, 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"
+msgstr ""
+"Använd detta formulär för att bjuda in dina vänner och kollegor till denna "
+"sida."
+
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Användaren har ingen profil."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Prenumerera på mina Twitter vänner här."
+
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+msgstr "Nej"
+
+#: lib/topposterssection.php:74
+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 ""
+
+#, fuzzy
+#~ msgid "Code not yet ready."
+#~ msgstr "Kunde inte tabort favoriten."
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "Skapa ett nytt konto"
+
+#, fuzzy
+#~ msgid "Delete my account confirmation"
+#~ msgstr "Kunde inte radera epost bekräftelsen."
+
+#, 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?"
+
+#, fuzzy
+#~ msgid "Showing recently popular notices"
+#~ msgstr "Sök innehåll i inlägg"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Kunde inte bekräfta epost"
+
+#~ msgid "Email address"
+#~ msgstr "Epostadress"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Fel uppstog när inlägget skulle läggas till"
+
+#~ 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."
diff --git a/locale/te_IN/LC_MESSAGES/laconica.mo b/locale/te_IN/LC_MESSAGES/laconica.mo
index cfcb68259..92e135972 100644
--- a/locale/te_IN/LC_MESSAGES/laconica.mo
+++ b/locale/te_IN/LC_MESSAGES/laconica.mo
diff --git a/locale/te_IN/LC_MESSAGES/laconica.po b/locale/te_IN/LC_MESSAGES/laconica.po
index 98ee16561..bfd0581c1 100644
--- a/locale/te_IN/LC_MESSAGES/laconica.po
+++ b/locale/te_IN/LC_MESSAGES/laconica.po
@@ -13,47 +13,84 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Veeven <veeven@gmail.com>\n"
-"Language-Team: Telugu <l10n@etelugu.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../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:193
+#: ../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."
+" 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 ""
+
+#: ../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/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 ""
-"ఈ అంతరంగిక భోగట�టా తప�ప: "
-"సంకేతపదం, ఈమెయిల� చిర�నామా, IM చిర�నామా, ఫోన� నంబర�."
 
-#: ../actions/subscribe.php:84 ../lib/mail.php:124 lib/mail.php:124
-#: lib/mail.php:126
+#: ../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/subscribe.php:86 ../lib/mail.php:126
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -64,118 +101,275 @@ msgid ""
 "%4$s.\n"
 msgstr ""
 
+#: ../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 ""
 
-#: ../actions/publicrss.php:60
+#: ../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 ""
+
+#: ../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:70 ../lib/stream.php:45
+#: ../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 మరియ� మిత�ర�ల�"
 
-#: ../lib/util.php:233 ../lib/util.php:257 lib/util.php:273
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33
 #, php-format
-#, fuzzy
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
-"[%%site.broughtby%%](%%site.broughtbyurl%%) వార� "
-"అందిస�త�న�న ఈ **%%site.name%%** అనేది మైక�రో బ�లాగింగ� సద�పాయం."
 
-#: ../lib/util.php:235
+#: ../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%%). "
+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%%** అనేది మైక�రో బ�లాగింగ� సద�పాయం."
 
-#: ../lib/util.php:250 ../lib/util.php:274 lib/util.php:290
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: 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/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
 msgstr "6 లేదా అంతకంటే ఎక�క�వ అక�షరాల�"
 
-#: ../actions/recoverpassword.php:165
+#: ../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/imsettings.php:188 ../actions/imsettings.php:197
-#: actions/imsettings.php:205
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55 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 ""
+
+#: ../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 ""
 
-#: ../lib/util.php:296
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
 msgstr "గ�రించి"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "అంగీకరించ�"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "ఓపెన��డీని చేర�చ�"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92
 msgid "Address"
 msgstr "చిర�నామా"
 
-#: ../actions/showstream.php:254
+#: ../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:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
 #, php-format
 msgid "All updates for %s"
 msgstr "%s కోసం అన�ని తాజాకరణలూ"
 
-#: ../actions/noticesearchrss.php:66
+#: ../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:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "ఇప�పటికే చేరార�!"
 
-#: ../actions/userauthorization.php:76 ../actions/userauthorization.php:77
-#: actions/userauthorization.php:83
+#: ../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:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "భవిష�యత�త�లో ఆటోమెటిగ�గా లోనికి ప�రవేశించ�; బయటి కంప�యూర�ల కొరక� కాద�!"
 
-#: ../actions/avatar.php:32
+#: ../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/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "అవతారాన�ని తాజాకరించాం."
 
@@ -186,274 +380,472 @@ msgid ""
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: ../lib/util.php:1136
+#: ../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
+#, fuzzy
 msgid "Before »"
 msgstr "ఇంతక�రితం »"
 
-#: ../actions/profilesettings.php:52
+#: ../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:93 ../actions/updateprofile.php:102
+#: ../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/updateprofile.php:118 ../actions/updateprofile.php:119
-#: actions/updateprofile.php:120
+#: ../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 ""
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+#: ../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/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: 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:121 lib/openid.php:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
 msgstr ""
 
-#: ../actions/imsettings.php:154 ../actions/imsettings.php:163
-#: actions/imsettings.php:171
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
-#: ../actions/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "మార�చ�"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "సంకేతపదం మార�చ�కోండి"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../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:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "చిర�నామాని నిర�ధారించ�"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "నిర�ధారణ రద�దయింది."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "నిర�ధారణ సంకేతం కనబడలేద�."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "అన�సంధానించ�"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "ఇప�పటికే ఉన�న ఖాతాతో అన�సంధానించండి"
 
-#: ../lib/util.php:304 ../lib/util.php:332 lib/util.php:348
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "సంప�రదించ�"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "ఓపెన��డీ ఫారమ�న� సృష�టించలేకపోయాం: %s"
 
-#: ../lib/openid.php:160 lib/openid.php:160
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow 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 ""
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166
 msgid "Could not save avatar info"
 msgstr "అవతారప� సమాచారాన�ని భద�రపరచలేక�న�నాం"
 
-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159
 msgid "Could not save new profile info"
 msgstr "కొత�త ప�రొఫైల� సమాచారాన�ని భద�రపరచలేక�న�నాం"
 
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-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:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "చందాని సృష�టించలేకపోయాం."
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: actions/confirmaddress.php:126 actions/emailsettings.php:375
+#: actions/imsettings.php:357 actions/smssettings.php:370
 msgid "Couldn't delete email confirmation."
 msgstr "ఈమెయిల� నిర�ధారణని తొలగించలేక�న�నాం."
 
-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
 msgstr "చందాని తొలగించలేకపోయాం."
 
-#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
+#: ../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."
 msgstr ""
 
-#: ../actions/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: 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:182 actions/finishremotesubscribe.php:218
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: ../actions/profilesettings.php:175
+#: ../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/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "సృష�టించ�"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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: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 ""
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "ప�రస�త�తం నిర�ధారించిన Jabber/GTalk చిర�నామా"
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../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 "ప�రస�త�తం"
 
-#: ../lib/util.php:893 ../lib/util.php:1061 lib/util.php:1110
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:54
+#: ../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:181
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "ఈమెయిల�"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
+msgid "Email Address"
 msgstr "ఈమెయిల� చిర�నామా"
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../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:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
 msgstr "ఈమెయిల� చిర�నామా నిర�ధారణ"
 
-#: ../actions/recoverpassword.php:176
+#: ../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/userauthorization.php:136 ../actions/userauthorization.php:137
-#: actions/userauthorization.php:144
+#: ../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:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:297
 msgid "Error connecting user to OpenID."
 msgstr "వాడ�కరిని ఓపెన��డీకి అన�సంధానించటంలో పొరపాట�."
 
-#: ../actions/finishaddopenid.php:78
+#: ../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:153 actions/finishremotesubscribe.php:166
 #, fuzzy
 msgid "Error inserting avatar"
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"అవతారాన�ని పెట�టడంలో "
-"పొరపాట�\n"
+"అవతారాన�ని పెట�టడంలో పొరపాట�\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
 msgid "Error inserting new profile"
 msgstr "కొత�త ప�రొపైల�ని చేర�చటంలో పొరపాట�"
 
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "సందేశాన�ని చేర�చటంలో పొరపాట�"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
 msgid "Error inserting remote profile"
 msgstr "దూరప� ప�రొపైల�ని చేర�చటంలో పొరపాట�"
 
-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
 msgstr "చిర�నామా నిర�ధారణని భద�రపరచడంలో పొరపాట�."
 
-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
 msgid "Error saving remote profile"
 msgstr "దూరప� ప�రొఫైల�ని భద�రపరచడంలో పొరపాట�"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../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:237 lib/openid.php:246
 msgid "Error saving the user."
 msgstr "వాడ�కరిని భద�రపరచడంలో పొరపాట�."
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164
 msgid "Error saving user; invalid."
 msgstr "వాడ�కరిని భద�రపరచడంలో పొరపాట�: సరికాద�."
 
-#: ../actions/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
 #: ../actions/login.php:47 ../actions/login.php:73
 #: ../actions/recoverpassword.php:307 ../actions/register.php:98
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108
+#: 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: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:79
+#: ../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:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "ప�రస�త�త పేర�"
 
-#: ../lib/util.php:298 ../lib/util.php:326 lib/util.php:342
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 #, fuzzy
 msgid "FAQ"
 msgstr ""
@@ -461,41 +853,69 @@ msgstr ""
 "తవసం\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "అవతారప� తాజాకరణ విఫలమైంది."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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:61 ../actions/repliesrss.php:80
+#: ../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/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, 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
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"భద�రతా కారణాల దృష�ట�యా, "
-"అమరికల� మార�చే మ�ంద� మీ వాడ�కరి పేర�ని మరియ� సంకేతపదాన�ని మరోసారి ఇవ�వండి."
+"భద�రతా కారణాల దృష�ట�యా, అమరికల� మార�చే మ�ంద� మీ వాడ�కరి పేర�ని మరియ� సంకేతపదాన�ని మరోసారి ఇవ�వండి."
 
-#: ../actions/profilesettings.php:44
+#: ../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:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "సహాయం"
 
-#: ../lib/util.php:274 ../lib/util.php:298 lib/util.php:314
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 #, fuzzy
 msgid "Home"
 msgstr ""
@@ -503,9 +923,10 @@ msgstr ""
 "వాకిలి\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/profilesettings.php:49 ../actions/profilesettings.php:46
-#: ../actions/register.php:167 actions/profilesettings.php:79
-#: actions/register.php:181
+#: ../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
 #, fuzzy
 msgid "Homepage"
 msgstr ""
@@ -513,25 +934,41 @@ msgstr ""
 "హోమ� పేజీ\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/profilesettings.php:87
+#: ../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/imsettings.php:61
+#: ../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 "IM చిర�నామా"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "IM అమరికల�"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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/openidsettings.php:45
 msgid ""
@@ -539,226 +976,382 @@ msgid ""
 "click \"Add\"."
 msgstr ""
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"మీర� మీ సంకేతపదాన�ని "
-"మర�చిపోతే, మీ ఖాతాలో భద�రపరచిన ఈమెయిల�కి కొత�తదాన�ని పంపించ�కోవచ�చ�."
 
-#: ../actions/password.php:69
+#: ../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 "పాత సంకేతపదం తప�ప�"
 
-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
 msgid "Incorrect username or password."
 msgstr "వాడ�కరిపేర� లేదా సంకేతపదం తప�ప�."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
-msgstr ""
-"మీ సంకేతపదాన�ని తిరిగి "
-"పొందడానికై అవసరమైన సూచనలని మీ ఖాతాతో నమోదైన ఈమెయిల� చిర�నామాకి పంపించాం."
+msgstr "మీ సంకేతపదాన�ని తిరిగి పొందడానికై అవసరమైన సూచనలని మీ ఖాతాతో నమోదైన ఈమెయిల� చిర�నామాకి పంపించాం."
 
-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "'%s' అనే అవతారప� URL తప�ప�"
 
-#: ../actions/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "'%s' అనే హోమ� పేజీ సరైనదికాద�"
 
-#: ../actions/updateprofile.php:81
+#: ../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:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
 msgid "Invalid notice content"
 msgstr "సందేశప� విషయం సరైనది కాద�"
 
-#: ../actions/postnotice.php:67
+#: ../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:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "సందేశప� URL తప�ప�"
 
-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "ప�రొపైల� URL '%s' తప�ప�."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135
 msgid "Invalid profile URL (bad format)"
 msgstr "ప�రొపైల� URL తప�ప� (చెడ� ఫార�మాట�)"
 
 #: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "తప�ప�డ� పరిమాణం."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
 msgid "Invalid username or password."
 msgstr "వాడ�కరిపేర� లేదా సంకేతపదం తప�ప�."
 
-#: ../lib/util.php:237 ../lib/util.php:261 lib/util.php:277
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#: ../actions/imsettings.php:164
+#: ../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:63 ../actions/imsettings.php:62
-#: actions/imsettings.php:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 
-#: ../actions/profilesettings.php:55
+#: ../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 ""
+
+#: ../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:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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: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:122 ../actions/login.php:126
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "నిష�క�రమించ�"
 
-#: ../actions/login.php:106
+#: ../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 "మీ సంకేతపదం మర�చిపోయారా?"
 
-#: ../actions/showstream.php:281
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php: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 "సభ�య�లైన తేదీ"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67
-#, php-format
-#, fuzzy
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#, fuzzy, php-format
 msgid "Microblog by %s"
 msgstr ""
 "#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "%s యొక�క మైక�రోబ�లాగ�\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
-#: ../actions/register.php:188 actions/finishopenidlogin.php:85
-#: actions/register.php:202
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/finishopenidlogin.php:107 actions/register.php:429
 msgid "My text and files are available under "
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71
+#: ../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 ""
+
+#: ../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:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "కొత�త సందేశం"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "మీ కొత�త సంకేతపదం భద�రమైంది. మీర� ఇప�ప�డ� లోనికి ప�రవేశించార�."
 
-#: ../actions/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../actions/login.php:101 ../actions/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:99
-#: ../actions/register.php:59
+#: ../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:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
-#: ../actions/profilesettings.php:88 ../actions/register.php:67
-#: ../actions/updateprofile.php:77 actions/finishopenidlogin.php:171
-#: actions/profilesettings.php:203 actions/register.php:74
-#: actions/updateprofile.php:78
+#: ../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: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:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "పేర� లేదా ఈమెయిల�"
 
-#: ../actions/imsettings.php:147
+#: ../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:128 ../actions/userauthorization.php:129
-#: actions/userauthorization.php:136
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr ""
 
-#: ../actions/confirmaddress.php:33
+#: ../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:49
+#: ../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/userbyid.php:27
+#: ../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 "�డీ లేద�."
 
+#: ../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
 #, fuzzy
 msgid "No nickname."
 msgstr ""
@@ -766,145 +1359,259 @@ msgstr ""
 "పేర� లేద�.\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: 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:74 actions/finishremotesubscribe.php:75
 msgid "No profile URL returned by server."
 msgstr ""
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+#: actions/recoverpassword.php:266
 msgid "No registered email address for that user."
 msgstr "ఈ వాడ�కరికై నమోదైన ఈమెయిల� చిర�నామాల� �మీ లేవ�."
 
-#: ../actions/userauthorization.php:48
+#: ../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:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "పరిమాణం లేద�."
 
-#: ../actions/openidsettings.php:135
+#: ../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/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+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:29 actions/doc.php:64
 msgid "No such document."
 msgstr "అట�వంటి పత�రమేమీ లేద�."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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 "అట�వంటి వాడ�కరి లేర�."
 
-#: ../lib/gallery.php:76 ../lib/gallery.php:80 lib/gallery.php:85
+#: ../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 ""
 
-#: ../actions/imsettings.php:158
+#: ../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 �డీ కాద�"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "సరైన ఓపెన��డీ కాద�."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../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:83 ../actions/register.php:61
+#: ../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:118 ../actions/remotesubscribe.php:120
-#: actions/remotesubscribe.php:129
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:159
 msgid "Not a valid profile URL (incorrect services)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:111 ../actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:122
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+#: actions/remotesubscribe.php:152
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:143
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
 msgstr "బొమ�మ కాద� లేదా పాడైపోయిన ఫైల�."
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/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/unsubscribe.php:43 ../lib/subs.php:91 lib/subs.php:104
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr ""
 
-#: ../actions/showstream.php:82
+#: ../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:297
+#: ../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/password.php:39
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "పాత సంకేతపదం"
 
-#: ../lib/util.php:288
+#: ../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/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73
 #, fuzzy
 msgid "OpenID Account Setup"
 msgstr ""
@@ -912,176 +1619,281 @@ msgstr ""
 "ఓపెన��డీ ఖాతా అమర�ప�\n"
 "#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/openid.php:180 lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
 msgid "OpenID Login"
 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/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/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 "ఓపెన��డీ అధీకరణ విఫలమైంది: %s"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "ఓపెన��డీ వైఫల�యం: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "ఓపెన��డీ అమరికల�"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "పాక�షిక ఎగ�మతి."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:335
 msgid "Password and confirmation do not match."
 msgstr "సంకేతపదం మరియ� నిర�ధారణ సరిపోలేద�."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+#: actions/recoverpassword.php:331
 msgid "Password must be 6 chars or more."
 msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక�కవ అక�షరాల�ండాలి."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
 msgid "Password recovery requested"
 msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../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/password.php:61 ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../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"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "వ�యక�త�ల అన�వేషణ"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "వ�యక�తిగత"
 
-#: ../actions/userauthorization.php:77 ../actions/userauthorization.php:78
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/userauthorization.php:78
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
 
-#: ../actions/imsettings.php:74 ../actions/imsettings.php:73
-#: actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
+#: actions/imsettings.php:142
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: ../actions/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "అభిర�చ�ల�"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "అభిర�చ�ల� భద�రమయ�యాయి."
 
-#: ../lib/util.php:300
+#: ../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 "అంతరంగికత"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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/stream.php:54
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "ప�రొఫైల� URL"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
 msgstr "ఫ�రొఫైల� అమరికల�"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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 "అజ�ఞాత ప�రొఫైల�"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "ప�రజా"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "ప�రజా వాహిని ఫీడ�"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "ప�రజా కాలరేఖ"
 
-#: ../actions/recoverpassword.php:151 ../actions/recoverpassword.php:166
-#: actions/recoverpassword.php:171
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr ""
 
-#: ../actions/recoverpassword.php:141 ../actions/recoverpassword.php:156
-#: actions/recoverpassword.php:161
+#: ../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:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: actions/register.php:69 actions/register.php:436 lib/action.php:338
+#: lib/facebookaction.php:277 lib/logingroupnav.php:78
 msgid "Register"
 msgstr "నమోద�"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "తిరస�కరించ�"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414
 msgid "Remember me"
 msgstr "నన�న� గ�ర�త�ంచ�కో"
 
-#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr ""
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "ఓపెన��డీని తొలగించండి"
 
@@ -1090,52 +1902,92 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"మీక�న�న ఒకే ఓపెన��డీని "
-"తొలగిస�తే మీర� లోనికి ప�రవేశించడం అసాధ�యమవవచ�చ�. మీర� దాన�ని తొలగించాలన�క�ంటే, మ�ంద� వేరే ఓపెన��డీని చేర�చండి."
+"మీక�న�న ఒకే ఓపెన��డీని తొలగిస�తే మీర� లోనికి ప�రవేశించడం అసాధ�యమవవచ�చ�. మీర� దాన�ని తొలగించాలన�క�ంటే, "
+"మ�ంద� వేరే ఓపెన��డీని చేర�చండి."
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
 msgid "Replies"
 msgstr "స�పందనల�"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../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:168 ../actions/recoverpassword.php:183
-#: actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr ""
 
-#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr ""
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
 msgid "Same as password above"
 msgstr "పై సంకేతపదం వలెనే"
 
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../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:73 ../lib/util.php:277
+#: ../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:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "అన�వేషణ వాహిని ఫీడ�"
 
-#: ../actions/noticesearch.php:30
+#: ../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 లేదా అంతకంటే ఎక�క�వ అక�షరాల� ఉండాలి."
+"%%site.name%%లోని సందేశాలన� వెతకండి. అన�వేషణ పదాలన� ఖాళీలతో వేర�చేయండి; ఒక�కో పదంలో 3 లేదా "
+"అంతకంటే ఎక�క�వ అక�షరాల� ఉండాలి."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1143,131 +1995,251 @@ msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"%%site.name%%లో వ�యక�త�లన� వారి "
-"పేర�, ప�రాంతం, లేదా "
-"ఆసక�త�లన� బట�టి వెతకండి. అన�వేషించే పదాలన� ఖాళీలతో వేర�చేయండి; ఒక�కో పదంలో 3 లేదా అంతకంటే ఎక�క�వ అక�షరాల� ఉండాలి."
+"%%site.name%%లో వ�యక�త�లన� వారి పేర�, ప�రాంతం, లేదా ఆసక�త�లన� బట�టి వెతకండి. అన�వేషించే పదాలన� "
+"ఖాళీలతో వేర�చేయండి; ఒక�కో పదంలో 3 లేదా అంతకంటే ఎక�క�వ అక�షరాల� ఉండాలి."
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: actions/smssettings.php:457
+msgid "Select a carrier"
+msgstr ""
 
-#: ../lib/util.php:982
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
+#: lib/messageform.php:167 lib/noticeform.php:177
 msgid "Send"
 msgstr "పంపించ�"
 
-#: ../actions/imsettings.php:71 ../actions/imsettings.php:70
-#: actions/imsettings.php:71
+#: ../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 ""
 
-#: ../lib/util.php:282
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr "అమరికల�"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "అమరికల� భద�రమయ�యాయి."
 
-#: ../actions/finishaddopenid.php:66
+#: ../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 "ఈ ఓపెన��డీని ఇప�పటికే ఎవరో వాడ�త�న�నార�."
 
 #: ../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 "జరగకూడనిదేదో జరిగింది."
 
-#: ../lib/util.php:302
+#: ../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:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "గణాంకాల�"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
-#: ../actions/finishopenidlogin.php:246 actions/finishopenidlogin.php:188
-#: actions/finishopenidlogin.php:252
+#: ../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 ""
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181 ../actions/showstream.php:188
+#: ../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:294 ../actions/subscribers.php:27
+#: ../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:309 ../actions/userauthorization.php:310
-#: actions/userauthorization.php:322
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr ""
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "చందాని తిరస�కరించార�."
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/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/noticesearch.php:34
+#: ../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:140 actions/openidsettings.php:149
+#: actions/openidsettings.php:227
 msgid "That OpenID does not belong to you."
 msgstr "ఆ ఓపెన��డీ మీది కాద�."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "ఆ చిర�నామా ఇప�పటికే నిర�ధారితమైంది."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
 msgstr "ఆ నిర�ధారణా సంకేతం మీది కాద�!"
 
-#: ../actions/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr "ఆ ఈమెయిల� చిర�నామా ఇప�పటేకే ఇతర వాడ�కరికి సంబంధించినది."
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "ఆ ఫైల� చాలా పెద�దగా ఉంది."
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr "ఈ Jabber ID మీక� ఇప�పటికే ఉంది"
 
-#: ../actions/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr "అది ఇప�పటికే మీ ఈమెయిల� చిర�నామా."
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr "ఇది మీ Jabber ID కాద�"
 
-#: ../actions/imsettings.php:201
+#: ../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/newnotice.php:52
+#: ../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/confirmaddress.php:86
+#: ../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/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" అనే చిర�నామా మీ ఖాతాకి నిర�ధారితమైంది."
 
-#: ../actions/imsettings.php:241
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413
 msgid "The address was removed."
 msgstr "ఆ చిర�నామాని తొలగించాం."
 
-#: ../actions/userauthorization.php:311 ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: ../actions/userauthorization.php:321 ../actions/userauthorization.php:322
+#: ../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 "
@@ -1292,7 +2264,12 @@ msgstr ""
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: ../actions/recoverpassword.php:87
+#: ../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/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
 msgstr "ఈ నిర�ధారణ సంకేతం చాలా పాతది. మళ�ళీ మొదల�పెట�టండి."
 
@@ -1303,6 +2280,7 @@ msgid ""
 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 "
@@ -1310,72 +2288,137 @@ msgid ""
 "your existing account, if you have one."
 msgstr ""
 
-#: ../lib/util.php:147 ../lib/util.php:164 lib/util.php:246
+#: ../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"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:132
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
-#: ../actions/profilesettings.php:51
+#: ../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 ""
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/smssettings.php:135 actions/emailsettings.php:144
-#: actions/imsettings.php:118 actions/recoverpassword.php:39
-#: actions/smssettings.php:143 actions/twittersettings.php:108
+#: ../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:237 ../actions/recoverpassword.php:276
-#: actions/recoverpassword.php:289
+#: ../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:60 actions/finishremotesubscribe.php:61
 msgid "Unknown version of OMB protocol."
 msgstr ""
 
-#: ../lib/util.php:245 ../lib/util.php:269 lib/util.php:285
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "గ�ర�త�తెలియని చిర�నామా రకం %s"
 
-#: ../actions/showstream.php:193 ../actions/showstream.php:209
-#: actions/showstream.php:219
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
-#: ../actions/updateprofile.php:45 actions/postnotice.php:45
-#: actions/updateprofile.php:46
+#: ../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/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr ""
 
-#: ../actions/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "ఎగ�మతించ�"
 
@@ -1387,109 +2430,201 @@ msgid ""
 "share."
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
-msgid "Used only for updates, announcements, and password recovery"
+#: ../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: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:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../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/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "వాడ�కరి పేర�"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
 msgstr "%s, సంగత�లేమిటి?"
 
-#: ../actions/profilesettings.php:57
+#: ../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/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "'%s' కొరక� తప�ప�డ� బొమ�మ రకం"
 
-#: ../actions/updateprofile.php:122 ../actions/updateprofile.php:123
-#: actions/updateprofile.php:124
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:64
+#: ../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 "ఈ ఓపెన��డీ మీక� ఇప�పటికే ఉంది!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "మీ సంకేతపదాన�ని ఇక�కడ మార�చ�కోవచ�చ�. మంచిది ఎంచ�కోండి!"
 
-#: ../actions/register.php:164
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "సందేశాల� పంపించడానికి మీర� కొత�త ఖాతా సృష�టించ�కోవచ�చ�."
 
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
-msgstr ""
-"\"తొలగించ�\" అనే బొత�తంపై "
-"నొక�కడం ద�వారా ఒక ఓపెన��డీని మీ ఖాతా న�ండి తొలగించ�కోవచ�చ�."
+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."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: 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:51
-#: ../actions/register.php:61 actions/finishopenidlogin.php:38
-#: actions/register.php:68
+#: ../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:62 ../actions/updateprofile.php:63
-#: actions/updateprofile.php:64
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67
 msgid "You did not send us that profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:134
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "మీ ఓపెన��డీ URL"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr "ఈ సర�వర�లో మీ పేర�, లేదా నమౌదైన మీ ఈమెయిల� చిర�నామా."
 
@@ -1499,1372 +2634,2202 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"ఒకే వాడ�కరి ఖాతాతో చాలా "
-"సైట�లలోనికి ప�రవేశించే వీల�ని [ఓపెన��డీ](%%doc.openid%%) కల�పిస�త�ంది. మీ ఓపెన��డీలన� ఇక�కడ సంభాళించ�కోండి."
+"ఒకే వాడ�కరి ఖాతాతో చాలా సైట�లలోనికి ప�రవేశించే వీల�ని [ఓపెన��డీ](%%doc.openid%%) కల�పిస�త�ంది. మీ "
+"ఓపెన��డీలన� ఇక�కడ సంభాళించ�కోండి."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "కొన�ని క�షణాల క�రితం"
 
-#: ../lib/util.php:826
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "%d రోజ�ల క�రితం"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d గంటల క�రితం"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d నిమిషాల క�రితం"
 
-#: ../lib/util.php:830
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr "%d నెలల క�రితం"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "ఓ రోజ� క�రితం"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "ఓ నిమిషం క�రితం"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "ఓ నెల క�రితం"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "ఒక సంవత�సరం క�రితం"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "ఒక గంట క�రితం"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "స�పందించ�"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "పై సంకేతపదం వలెనే"
 
-#: ../lib/util.php:1127
+#: ../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 "« తర�వాత"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
+#: 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/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: 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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
+msgid "%s favorite notices"
 msgstr ""
 
-#: ../actions/invite.php:168 actions/invite.php:176
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
+msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+#: 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:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
+#: actions/login.php:122 actions/login.php:264
+msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
+#: actions/login.php:126 actions/login.php:268
+msgid "Login with your username and password. "
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
+#: 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/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
+#: 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/register.php:213
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+msgid "No such user"
 msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
+#: actions/newmessage.php:117 actions/newmessage.php:67
+msgid "New message"
 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/noticesearch.php:95 actions/noticesearch.php:146
+msgid "Notice without matching profile"
 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/openidsettings.php:28 actions/openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+#: actions/outbox.php:53 actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+"Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
+msgid "You can update your personal profile info here "
 msgstr ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
+#: 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/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+msgid "This confirmation code is too old. "
 msgstr ""
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
 msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
 msgstr ""
 
-#: ../actions/register.php:202
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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...\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."
+"want to..."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: 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 "Could not follow user: %s is already on your list."
+msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
 msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
+#: actions/showstream.php:154
+msgid "Send a message"
 msgstr ""
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, php-format
+msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#, php-format
+msgid "Direct messages to %s"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr "ఈమెయిల� చిర�నామా"
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr "ఈమెయిల� అమరికల�"
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
+msgid "No message text!"
+msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr "ఈమెయిల� చిర�నామా, \"username@example.org\" వలె"
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
+msgid "Recipient user not found."
+msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
+#: 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/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
-msgid "Feed for tag %s"
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
+#: 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 ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
+#: 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 ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
+#: 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/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/twittersettings.php:63
+msgid "Twitter Username"
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
+#: 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/invite.php:55 actions/invite.php:62
+#: 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 ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
 #, php-format
-msgid "Invalid email address: %s"
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
+#: 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/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+msgid "Twitter settings saved."
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr "ఆహ�వానించ�"
+#: actions/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."
+msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
+msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr "భాష"
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
+msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
+#: 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/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+msgid "Twitter preferences 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."
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: 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 ""
+
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96 classes/Command.php:113
 #, php-format
-msgid "Manage how you get email from %%site.name%%."
+msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: ../actions/smssettings.php:304
+#: 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 ""
+
+#: classes/Command.php:166 classes/Command.php:189
 #, 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 "%1$s (%2$s)"
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
+msgstr "పూర�తిపేర�: %s"
+
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
+msgstr "ప�రాంతం: %s"
+
+#: classes/Command.php:175 classes/Command.php:198
+#, php-format
+msgid "Homepage: %s"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
+#: classes/Command.php:178 classes/Command.php:201
 #, php-format
-msgid "New email address for posting to %s"
+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/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
+#: classes/Command.php:295 classes/Command.php:335
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
+#: classes/Command.php:376
+msgid "Command not yet implemented."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
+#: classes/Command.php:313 classes/Command.php:356
+msgid "Notification off."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
 msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
 msgstr ""
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
+#: classes/Message.php:53 classes/Message.php:56
+msgid "Could not insert message."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
+#: classes/Message.php:63 classes/Message.php:66
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
+#: lib/mail.php:147 lib/mail.php:289
 #, php-format
-msgid "Notices tagged with %s"
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
 
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
 msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
+#: lib/mail.php:253 lib/mail.php:512
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
+#: lib/mailbox.php:43 lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
+#: lib/openid.php:195 lib/openid.php:203
+msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+msgid "Favorites"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
+msgstr "వాడ�కరి"
+
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
 msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
+msgstr "మీక� వచ�చిన సందేశాల�"
+
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
+msgstr "మీర� పంపిన సందేశాల�"
+
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
+msgid "Twitter"
 msgstr ""
 
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
+msgid "Twitter integration options"
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+msgid "Could not parse message."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
+#: 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."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "ట�విట�టర� అమరికల�"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
 msgstr ""
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
+#: 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/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."
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
 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/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"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "అట�వంటి వాడ�కరి లేర�."
+
+#: actions/block.php:129
+msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
+#: actions/block.php:162
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
+
+#: actions/block.php:167
+msgid "Failed to save block information."
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
+#: 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 ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "పాఠ�యం"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "ఆ ఈమెయిల� చిర�నామా ఇప�పటేకే ఇతర వాడ�కరికి సంబంధించినది."
+#: actions/editgroup.php:54
+#, php-format
+msgid "Edit %s group"
+msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-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/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
+#: 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 ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"పేర� లేద�.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
+#: 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"
 msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+msgid "Nickname must have only lowercase letters "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "స�వపరిచయం చాలా పెద�దగా ఉంది (140 అక�షరాల� గరిష�ఠం)."
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "అమరికల� భద�రమయ�యాయి."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "నిర�ధారణ సంకేతంలో పొరపాట�."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
+#: 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!"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
+#: actions/facebookhome.php:196
+#, php-format
+msgid "If you would like the %s app to automatically update "
 msgstr ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, php-format
+msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: actions/facebookhome.php:218
+msgid "Skip"
 msgstr ""
 
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
+#: actions/facebookhome.php:235
+#, fuzzy
+msgid "No notice content!"
+msgstr "విషయం లేద�!"
+
+#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+msgid "Pagination"
 msgstr ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
+#: 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/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/facebookinvite.php:96
 #, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+msgid "You have been invited to %s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "%s యొక�క మిత�ర�ల ఫీడ�"
+
+#: actions/facebookinvite.php:113
 #, php-format
-msgid "Updates from %1$s on %2$s!"
+msgid "Friends already using %s:"
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
 msgstr ""
 
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: 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!"
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "అభిర�చ�ల� భద�రమయ�యాయి."
+
+#: actions/facebooksettings.php:90
+msgid "Automatically update my Facebook status with my notices."
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-msgstr "అవ�న�"
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+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/facebooksettings.php:108
+msgid "A string to prefix notices with."
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "అభిర�చ�ల�"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+#: 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."
 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"
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
+#: actions/featured.php:99
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "A selection of some of the great users on %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!"
+#: actions/finishremotesubscribe.php:188
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/groupbyid.php:79
+msgid "No ID"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+msgid "Group logo"
 msgstr ""
 
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "అవతారాన�ని తాజాకరించాం."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "అవతారప� తాజాకరణ విఫలమైంది."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Favor"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
 msgstr ""
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
+#: actions/groups.php:90
+#, php-format
+msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
+#: 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. "
 msgstr ""
+"%%site.name%%లో వ�యక�త�లన� వారి పేర�, ప�రాంతం, లేదా ఆసక�త�లన� బట�టి వెతకండి. అన�వేషించే పదాలన� "
+"ఖాళీలతో వేర�చేయండి; ఒక�కో పదంలో 3 లేదా అంతకంటే ఎక�క�వ అక�షరాల� ఉండాలి."
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "వ�యక�త�ల అన�వేషణ"
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/imsettings.php:120
 #, php-format
-msgid "%s favorite notices"
+msgid "Jabber or GTalk address, "
 msgstr ""
 
-#: actions/favoritesrss.php:64
-#, php-format
-msgid "Feed of favorite notices of %s"
+#: actions/imsettings.php:147
+msgid "Send me replies through Jabber/GTalk "
+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."
 msgstr ""
 
-#: actions/inbox.php:28
+#: actions/joingroup.php:95
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
+
+#: actions/joingroup.php:128
 #, php-format
-msgid "Inbox for %s - page %d"
+msgid "Could not join user %s to group %s"
 msgstr ""
 
-#: actions/inbox.php:30
+#: actions/joingroup.php:135
 #, php-format
-msgid "Inbox for %s"
+msgid "%s joined group %s"
 msgstr ""
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
+#: 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
+#, fuzzy
+msgid "No such group."
+msgstr "అట�వంటి సందేశమేమీ లేద�."
+
+#: actions/leavegroup.php:95
+msgid "You are not a member of that group."
 msgstr ""
 
-#: actions/invite.php:178
+#: 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 ""
+
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "ఓపెన��డీ ఫారమ�న� సృష�టించలేకపోయాం: %s"
+
+#: actions/leavegroup.php:145
 #, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: actions/login.php:126
-msgid "Login with your username and password. "
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newmessage.php:65
-msgid "No recipient specified."
+#: actions/newgroup.php:177
+#, fuzzy
+msgid "Could not create group."
+msgstr "అవతారప� సమాచారాన�ని భద�రపరచలేక�న�నాం"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "చందాని సృష�టించలేకపోయాం."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "ఆ ఫైల� చాలా పెద�దగా ఉంది."
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "సందేశాల�"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: actions/nudge.php:85
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: actions/newmessage.php:108
-msgid "No such user"
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: actions/newmessage.php:117
-msgid "New message"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
+#: actions/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "ఓపెన��డీ ప�రవేశం"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "ఓపెన��డీని తొలగించండి"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "ట�విట�టర� అమరికల�"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
 msgstr ""
 
-#: actions/openidsettings.php:28
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "వెత�క�"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "ప�రాంతం పేర� మరీ పెద�దగా ఉంది (255 అక�షరాల� గరిష�ఠం)."
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "సంకేతపదం మార�చ�కోండి"
+
+#: actions/passwordsettings.php:89
+#, 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 "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
+#: actions/peopletag.php:91
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: 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 ""
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
+#: actions/profilesettings.php:144
+msgid "Automatically subscribe to whoever "
 msgstr ""
 
-#: actions/outbox.php:28
+#: 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."
+msgstr ""
+
+#: actions/public.php:220
 #, php-format
-msgid "Outbox for %s - page %d"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
 
-#: actions/outbox.php:30
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "ప�రజా వాహిని ఫీడ�"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Outbox for %s"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/peoplesearch.php:28
+#: 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
+#, 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 "మీ హోమ� పేజీ, బ�లాగ�, లేదా వేరే సేట�లోని మీ ప�రొఫైల� యొక�క చిర�నామా"
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "మీ గ�రించి మరియ� మీ ఆసక�త�ల గ�రించి 140 అక�షరాల�లో చెప�పండి"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "మీర� ఎక�కడ న�ండి, \"నగరం, రాష�ట�రం (లేదా ప�రాంతం), దేశం\""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+msgstr "ఈ అంతరంగిక భోగట�టా తప�ప: సంకేతపదం, ఈమెయిల� చిర�నామా, IM చిర�నామా, ఫోన� నంబర�."
+
+#: actions/register.php:471
 #, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr ""
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
+#: actions/register.php:495
+msgid "(You should receive a message by email "
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
+#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
+msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
+#: actions/replies.php:118
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "%sకి స�పందనల�"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
 msgstr ""
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
+#: 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"
 msgstr ""
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
+#: 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"
 msgstr ""
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, 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 ""
 
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
+#: actions/showgroup.php:370
+msgid "All members"
 msgstr ""
 
-#: actions/register.php:216
+#: actions/showgroup.php:378
 #, php-format
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: actions/showstream.php:73
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+msgid "%s, page %d"
 msgstr ""
 
-#: actions/showfavorites.php:61
-#, php-format
-msgid "Feed for favorites of %s"
+#: 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"
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
+#: actions/showstream.php:317
+msgid "User actions"
 msgstr ""
 
-#: actions/showmessage.php:33
-msgid "No such message."
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/showstream.php:343
+msgid "Message"
 msgstr ""
 
-#: actions/showmessage.php:61
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "చందాదార�ల�"
+
+#: actions/showstream.php:533
+msgid "All groups"
 msgstr ""
 
-#: actions/showmessage.php:66
+#: actions/showstream.php:542
 #, php-format
-msgid "Message from %1$s on %2$s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: 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; "
 msgstr ""
 
-#: actions/smssettings.php:312
-#, php-format
-msgid "Mobile carrier for your phone. "
+#: 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/twitapidirect_messages.php:76
-#, php-format
-msgid "Direct messages to %s"
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: 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 "చందాదార�ల�"
+
+#: actions/subscribers.php:52
 #, php-format
-msgid "All the direct messages sent to %s"
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
+#: actions/subscribers.php:63
+msgid "These are the people who listen to "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/subscribers.php:67
 #, php-format
-msgid "All the direct messages sent from %s"
+msgid "These are the people who "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
+#: 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 "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: 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 ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"%s యొక�క మైక�రోబ�లాగ�\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: actions/twitapifavorites.php:92
+#: actions/tag.php:66
 #, php-format
-msgid "%s / Favorites from %s"
+msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: 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 "%s updates favorited by %s / %s."
+msgid "Tag %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#, php-format
-msgid "%s added your notice as a favorite"
+#: actions/tagother.php:141
+msgid "Tag user"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#, php-format
+#: actions/tagother.php:149
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/tagother.php:164
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/tagother.php:191
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
-msgstr "ట�విట�టర� అమరికల�"
+#: actions/tagother.php:198
+#, fuzzy
+msgid "Could not save tags."
+msgstr "అవతారప� సమాచారాన�ని భద�రపరచలేక�న�నాం"
 
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
-msgstr "ట�విట�టర� ఖాతా"
+#: actions/tagother.php:233
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
 
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "అట�వంటి సందేశమేమీ లేద�."
+
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"%s యొక�క మైక�రోబ�లాగ�\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
 msgstr ""
 
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "అభ�యర�థనలేమీ కనబడలేద�!"
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
+#: actions/twittersettings.php:119
+#, fuzzy
+msgid "Twitter user name"
+msgstr "ట�విట�టర� అమరికల�"
+
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "కొత�త సంకేతపదం"
+
+#: actions/twittersettings.php:228
+#, fuzzy
+msgid "Twitter Friends"
+msgstr "ట�విట�టర� అమరికల�"
+
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
 msgstr ""
 
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
+#: actions/twittersettings.php:341
+#, fuzzy, php-format
+msgid "Unable to retrieve account information "
+msgstr "ఈమెయిల� నిర�ధారణని తొలగించలేక�న�నాం."
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "వాడ�కరిని భద�రపరచడంలో పొరపాట�."
+
+#: actions/unsubscribe.php:50
+msgid "No profile id in request."
 msgstr ""
 
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/unsubscribe.php:71
+#, 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 ""
+
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "సందేశాన�ని భద�రపరచడంలో పొరపాట�."
+
+#: classes/Notice.php:109
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+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 "Unable to retrieve account information for \"%s\" from Twitter."
+msgid "%s - %s"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
+#: lib/action.php:145
+msgid "Untitled page"
 msgstr ""
 
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
+#: lib/action.php:316
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
+#: lib/action.php:325
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "గ�రించి"
+
+#: lib/action.php:328
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
+#: lib/action.php:332
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
+#: lib/action.php:335
+msgid "Login to the site"
 msgstr ""
 
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "కొత�త ఖాతా సృష�టించ�కోండి"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "అట�వంటి ఓపెన��డీ లేద�."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "సహాయం"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "కొత�త సందేశం"
+
+#: lib/action.php:417
+msgid "Local views"
 msgstr ""
 
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "కొత�త సందేశం"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "చందాల�"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
 msgstr ""
 
-#: classes/Channel.php:113
-msgid "Command results"
+#: lib/action.php:630
+msgid "All "
 msgstr ""
 
-#: classes/Channel.php:148
-msgid "Command complete"
+#: lib/action.php:635
+msgid "license."
 msgstr ""
 
-#: classes/Channel.php:158
-msgid "Command failed"
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "అట�వంటి వాడ�కరి లేర�."
+
+#: lib/blockform.php:153
+msgid "Block"
 msgstr ""
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
 msgstr ""
 
-#: classes/Command.php:96
+#: lib/facebookaction.php:268
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
+#: 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/feedlist.php:64
+msgid "Export data"
 msgstr ""
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
+#: lib/galleryaction.php:121
+msgid "Filter tags"
 msgstr ""
 
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
+#: lib/galleryaction.php:131
+msgid "All"
 msgstr ""
 
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
-msgstr "పూర�తిపేర�: %s"
+#: lib/galleryaction.php:137
+msgid "Tag"
+msgstr ""
 
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
-msgstr "ప�రాంతం: %s"
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "మీ హోమ� పేజీ, బ�లాగ�, లేదా వేరే సేట�లోని మీ ప�రొఫైల� యొక�క చిర�నామా"
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "చందాల�"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "మీ గ�రించి మరియ� మీ ఆసక�త�ల గ�రించి 140 అక�షరాల�లో చెప�పండి"
+
+#: lib/groupeditform.php:158
+#, 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"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
 
-#: classes/Command.php:175
+#: lib/groupnav.php:101
 #, php-format
-msgid "Homepage: %s"
+msgid "Edit %s group properties"
 msgstr ""
 
-#: classes/Command.php:178
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "నిష�క�రమించ�"
+
+#: lib/groupnav.php:107
 #, php-format
-msgid "About: %s"
-msgstr "గ�రించి: %s"
+msgid "Add or edit %s logo"
+msgstr ""
+
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
+msgstr ""
+
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr ""
 
-#: classes/Command.php:200
+#: lib/grouptagcloudsection.php:56
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Tags in %s group's notices"
 msgstr ""
 
-#: classes/Command.php:214
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "హోమ� పేజీ URL సరైనది కాద�."
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "ప�రవేశించండి"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "భద�రపరచ�"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "వాడ�కరిపేర� లేదా సంకేతపదం తప�ప�."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "కొత�త ఖాతా సృష�టించ�కోండి"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
 #, php-format
-msgid "Direct message to %s sent"
+msgid ""
+"Hey, %s.\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:216
-msgid "Error sending direct message."
+#: lib/mail.php:236
+#, php-format
+msgid "%1$s is now listening to "
 msgstr ""
 
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "ప�రాంతం: %s"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"హోమ� పేజీ\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: classes/Command.php:270
+#: lib/mail.php:258
 #, php-format
-msgid "Subscribed to %s"
+msgid ""
+"Bio: %s\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
 msgstr ""
 
-#: classes/Command.php:295
+#: lib/mail.php:465
 #, php-format
-msgid "Unsubscribed from %s"
+msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
+#: lib/mail.php:555
+#, php-format
+msgid "%1$s just added your notice from %2$s"
 msgstr ""
 
-#: classes/Command.php:313
-msgid "Notification off."
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
 msgstr ""
 
-#: classes/Command.php:315
-msgid "Can't turn off notification."
+#: lib/messageform.php:110
+msgid "Send a direct notice"
 msgstr ""
 
-#: classes/Command.php:333
-msgid "Notification on."
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "కొత�త సందేశం"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 లేదా అంతకంటే ఎక�క�వ అక�షరాల�"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "దీనికి స�పందనగా..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
 msgstr ""
 
-#: classes/Command.php:335
-msgid "Can't turn on notification."
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "స�పందించ�"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+msgid "Delete this notice"
 msgstr ""
 
-#: classes/Command.php:344
-msgid "Commands:\n"
+#: lib/noticelist.php:474
+msgid "Delete"
 msgstr ""
 
-#: classes/Message.php:53
-msgid "Could not insert message."
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
 msgstr ""
 
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
+#: lib/nudgeform.php:128
+msgid "Nudge"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/personaltagcloudsection.php:56
 #, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
+#: lib/profilelist.php:182
+msgid "(none)"
 msgstr ""
 
-#: lib/mail.php:253
-#, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "ప�రజా"
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
 msgstr ""
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
 msgstr ""
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
+#: lib/publicgroupnav.php:86
+msgid "Featured"
 msgstr ""
 
-#: lib/personal.php:65
-msgid "Favorites"
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "వ�యక�త�ల అన�వేషణ"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "సందేశాల�"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
 msgstr ""
 
-#: lib/personal.php:66
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
 #, php-format
-msgid "%s's favorite notices"
+msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/personal.php:66
-msgid "User"
-msgstr "వాడ�కరి"
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "%sకి స�పందనల�"
 
-#: lib/personal.php:75
-msgid "Inbox"
+#: lib/subgroupnav.php:97
+#, php-format
+msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/personal.php:76
-msgid "Your incoming messages"
-msgstr "మీక� వచ�చిన సందేశాల�"
-
-#: lib/personal.php:80
-msgid "Outbox"
+#: lib/subgroupnav.php:104
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/personal.php:81
-msgid "Your sent messages"
-msgstr "మీర� పంపిన సందేశాల�"
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
 
-#: lib/settingsaction.php:99
-msgid "Twitter"
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "చందాదార�ల�"
+
+#: lib/tagcloudsection.php:56
+msgid "None"
 msgstr ""
 
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
+#: lib/topposterssection.php:74
+msgid "Top posters"
 msgstr ""
 
-#: lib/util.php:1718
-msgid "To"
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "అట�వంటి వాడ�కరి లేర�."
+
+#: lib/unblockform.php:150
+msgid "Unblock"
 msgstr ""
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "కొత�త ఖాతా సృష�టించ�కోండి"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "ఈమెయిల�ని నిర�ధారించలేక�న�నాం."
+
+#~ msgid "Email address"
+#~ msgstr "ఈమెయిల� చిర�నామా"
+
+#~ msgid "Error inserting notice"
+#~ 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 "మీర� మీ సంకేతపదాన�ని మర�చిపోతే, మీ ఖాతాలో భద�రపరచిన ఈమెయిల�కి కొత�తదాన�ని పంపించ�కోవచ�చ�."
diff --git a/locale/tr_TR/LC_MESSAGES/laconica.mo b/locale/tr_TR/LC_MESSAGES/laconica.mo
index f825a89cb..4b8b55022 100644
--- a/locale/tr_TR/LC_MESSAGES/laconica.mo
+++ b/locale/tr_TR/LC_MESSAGES/laconica.mo
diff --git a/locale/tr_TR/LC_MESSAGES/laconica.po b/locale/tr_TR/LC_MESSAGES/laconica.po
index 275ff72b6..cb8bf60e7 100644
--- a/locale/tr_TR/LC_MESSAGES/laconica.po
+++ b/locale/tr_TR/LC_MESSAGES/laconica.po
@@ -4,51 +4,89 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.po (Laconi.ca Türkçe)  #-#-#-#-#\n"
-"Project-Id-Version: Laconi.ca Türkçe\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: 2008-07-29 12:33+0100\n"
-"Last-Translator: Kemal Yaylali <kemal.yaylali@gmail.com>\n"
-"Language-Team: nedurum.com\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Turkish\n"
-"X-Poedit-Country: TURKEY\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"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"
 "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"
 
-#: ../actions/noticesearchrss.php:64
+#: ../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/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../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."
+" except this private data: password, email address, IM address, phone number."
 msgstr ""
 "bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
 "numarası."
 
-#: ../actions/subscribe.php:84
+#: ../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 ""
+
+#: ../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/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 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/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -62,558 +100,1016 @@ msgstr ""
 "\n"
 "\t%3$s\n"
 "\n"
-"Kendisini durumsuz bırakmayın!,\n%4$s.\n"
+"Kendisini durumsuz bırakmayın!,\n"
+"%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../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 "%1$s'in %2$s'deki durum mesajları "
 
-#: ../actions/publicrss.php:60
+#: ../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 ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Genel Durum Mesajları"
 
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#: ../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 ve arkadaşları"
 
-#: ../lib/util.php:233
+#: ../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
 #, 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/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
 "**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından "
 "hazırlanan anında mesajlaşma ağıdır. "
 
-#: ../lib/util.php:235
+#: ../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:250
+#: ../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/register.php:176
+#: 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 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
 "verilmez"
 
-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
 msgstr "6 veya daha fazla karakter"
 
-#: ../actions/recoverpassword.php:165
+#: ../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/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından size "
+"mesaj yollanabilmesi için onaylamanız gerekmektedir."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından "
-"size mesaj yollanabilmesi için onaylamanız gerekmektedir."
 
-#: ../lib/util.php:296
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
 msgstr "Hakkında"
 
-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "Kabul et"
 
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "OpenID ekle"
 
-#: ../actions/imsettings.php:39
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92
 msgid "Address"
 msgstr "Adres"
 
-#: ../actions/showstream.php:254
+#: ../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 "Bütün abonelikler"
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
 #, php-format
 msgid "All updates for %s"
 msgstr "%s için bütün güncellemeler"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, 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:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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ış."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "Zaten abone olunmuÅŸ!."
 
-#: ../actions/userauthorization.php:76
+#: ../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 "Takip isteÄŸini onayla"
 
-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için "
-"deÄŸildir!"
+"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)"
+msgstr ""
 
-#: ../actions/avatar.php:32
+#: ../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/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "Avatar güncellendi."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"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?)"
+"Bu adresten onay bekleniyor. Jabber/Google Talk hesabınızı ayrıntılı bilgi "
+"içeren mesajı almak için kontrol edin. (%s'u arkadaş listenize eklediniz mi?)"
 
-#: ../lib/util.php:1136
+#: ../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
+#, fuzzy
 msgid "Before »"
 msgstr "Önce »"
 
-#: ../actions/profilesettings.php:52
+#: ../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"
 
-#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
+#: ../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/updateprofile.php:118
+#: ../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 "Avatar URLi '%s' okunamıyor"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+#: ../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/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114
 msgid "Cancel"
 msgstr "Ä°ptal et"
 
-#: ../lib/openid.php:121
+#: ../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/imsettings.php:154
+#: ../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/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "DeÄŸiÅŸtir"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Parolayı değiştir"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../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 "Onayla"
 
-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Adresi Onayla"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "Onaylama iptal edildi."
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Onay kodu bulunamadı."
 
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "BaÄŸlan"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "Varolan hesaba baÄŸlan"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Ä°letiÅŸim"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "OpenID formu yaratılamadı: %s"
 
-#: ../lib/openid.php:160
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow 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 "Sunucuya yönlendirme yapılamadı: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166
 msgid "Could not save avatar info"
 msgstr "Avatar bilgisi kaydedilemedi"
 
-#: ../actions/updateprofile.php:154
+#: ../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/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Eposta onaylanamadı."
+#: ../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:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
-#  Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Abonelik oluşturulamadı."
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../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/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
 msgstr "Abonelik silinemedi."
 
-#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
+#: ../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."
 msgstr ""
 
 #  Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
-#: ../actions/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: actions/emailsettings.php:337 actions/imsettings.php:311
+#: actions/smssettings.php:325
 msgid "Couldn't insert confirmation code."
 msgstr "Onay kodu eklenemedi."
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
 msgid "Couldn't insert new subscription."
 msgstr "Yeni abonelik eklenemedi."
 
-#: ../actions/profilesettings.php:175
+#: ../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/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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 "Kullanıcı güncellenemedi."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Yarat"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "Yeni hesap oluÅŸtur"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../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/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Onaylanmış Jabber/Gtalk adresi."
 
-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../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 "Åžu anda"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %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/profilesettings.php:54
+#: ../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 "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
-#: ../actions/register.php:181
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "Eposta"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "Eposta adresi"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
+msgid "Email Address"
+msgstr ""
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../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 "Eposta adresi zaten var."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
 msgstr "Eposta adresi onayı"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../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 "Bir takma ad veya eposta adresi girin."
 
-#: ../actions/userauthorization.php:136 ../actions/userauthorization.php:137
-#: actions/userauthorization.php:144
+#: ../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:282
+#: ../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:78
+#: actions/finishaddopenid.php:126
 msgid "Error connecting user."
 msgstr "Kullanıcı bağlamada hata oluştu."
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
 msgid "Error inserting avatar"
 msgstr "Avatar eklemede hata oluÅŸtu"
 
 #: ../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/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Durum gönderilirken hata oluştu"
-
 #: ../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/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
 msgstr "Adres onayını kaydetmede hata."
 
-#: ../actions/userauthorization.php:139
+#: ../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/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving the profile."
 msgstr "Profili kaydetmede hata oluÅŸtu."
 
-#: ../lib/openid.php:237
+#: ../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/password.php:80
+#: ../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/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 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/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
 msgid "Error updating profile"
 msgstr "Profil güncellemede hata oluştu"
 
 #: ../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/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+#: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
 msgstr "Onay kodu hatası."
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "Varolan takma ad"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "SSS"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "Avatar güncellemede hata."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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/replies.php:61 ../actions/repliesrss.php:80
+#: ../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/login.php:118
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, 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
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen "
-"kullanıcı adınızı ve parolanızı tekrar giriniz."
+"Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı "
+"ve parolanızı tekrar giriniz."
 
-#: ../actions/profilesettings.php:44
+#: ../actions/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/profilesettings.php:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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)."
 
-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "Yardım"
 
-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "Başlangıç"
 
 #  Belki Durum Merkezi falan denebilir mi ki?
-#: ../actions/profilesettings.php:49
+#: ../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/profilesettings.php:87
+#: ../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/imsettings.php:61
+#: ../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 "IM adresi"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "IM Ayarları"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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."
+"Eğer zaten bir hesabınız varsa, kullanıcı adınız ve parolanız ile giriş "
+"yapıp hesabınızı OpenID'nize bağlayabilirsiniz."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Eğer hesabınıza bir OpenID eklemek istiyorsanız, aşağıdaki kutuya "
-"girin ve \"Add\" düğmesine tıklayın."
+"Eğer hesabınıza bir OpenID eklemek istiyorsanız, aşağıdaki kutuya girin ve "
+"\"Add\" düğmesine tıklayın."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"Eğer parolanızı unuttuysanız veya kaybettiyseniz, hesabınıza eklemiş "
-"olduğunuz eposta adresine yeni bir tane gönderilmesini sağlayabilirsiniz."
 
-#: ../actions/password.php:69
+#: ../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 "Eski parola yanlış"
 
-#: ../actions/login.php:63
+#: ../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/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Hesabınıza eklemiş olduğunuz eposta adresine parolanızı geri getirmek "
-"için gerekli olan talimatlar yollanmıştır."
+"Hesabınıza eklemiş olduğunuz eposta adresine parolanızı geri getirmek için "
+"gerekli olan talimatlar yollanmıştır."
 
-#: ../actions/updateprofile.php:113
+#: ../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/updateprofile.php:97
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+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/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Geçersiz lisans URLi '%s'"
 
-#: ../actions/postnotice.php:61
+#: ../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: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:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "Geçersiz durum adresi"
 
-#: ../actions/updateprofile.php:86
+#: ../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/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:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Geçersiz büyüklük."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: 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."
 
-#: ../lib/util.php:237
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"nedurum.com [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html) lisansı ile "
-"korunan [Laconica](http://laconi.ca/) microbloglama yazılımının %s. "
-"versiyonunu kullanmaktadır."
+"nedurum.com [GNU Affero General Public License](http://www.fsf.org/licensing/"
+"licenses/agpl-3.0.html) lisansı ile korunan [Laconica](http://laconi.ca/) "
+"microbloglama yazılımının %s. versiyonunu kullanmaktadır."
 
-#: ../actions/imsettings.php:164
+#: ../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/imsettings.php:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -622,438 +1118,785 @@ 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:55
+#: ../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 ""
+
+#: ../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:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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: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:122
+#: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
-"Kullanıcı adı ve parolanızla giriş yapın. Henüz bir hesabınız yok "
-"mu? Ne duruyorsunuz, hemen bir [yeni hesap oluÅŸturun](%%action.register%%) "
-"ya da [OpenID](%%action.openidlogin%%) ile giriş yapın."
+"Kullanıcı adı ve parolanızla giriş yapın. Henüz bir hesabınız yok mu? Ne "
+"duruyorsunuz, hemen bir [yeni hesap oluÅŸturun](%%action.register%%) ya da "
+"[OpenID](%%action.openidlogin%%) ile giriş yapın."
 
-#: ../lib/util.php:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Çıkış"
 
-#: ../actions/login.php:106
+#: ../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 "Parolamı unuttum veya kaybettim"
 
-#: ../actions/showstream.php:281
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php: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 "Üyelik başlangıcı"
 
-#: ../actions/userrss.php:70
+#: ../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/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: 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/finishopenidlogin.php:71
+#: ../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 ""
+
+#: ../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 "Yeni takma ad"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "Yeni durum mesajı"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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/recoverpassword.php:275
+#: ../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/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../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/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59
+#: ../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/finishopenidlogin.php:165 ../actions/profilesettings.php:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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 ""
 "Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
 "kullanılamaz. "
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
 msgstr "Takma ada izin verilmiyor."
 
-#: ../actions/remotesubscribe.php:72
+#: ../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/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "Takma ad veya eposta"
 
-#: ../actions/imsettings.php:147
+#: ../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 "JabberID yok."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "Yetkilendirme isteÄŸi yok!"
 
-#: ../actions/confirmaddress.php:33
+#: ../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 "Onay kodu yok."
 
-#: ../actions/newnotice.php:49
+#: ../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/userbyid.php:27
+#: ../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 "Kullanıcı numarası yok"
 
+#: ../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 "Uzaktaki sunucu tarafından bir takma ad sağlanmadı."
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
 msgstr "Takma ad yok"
 
-#: ../actions/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: 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/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:74 actions/finishremotesubscribe.php:75
 msgid "No profile URL returned by server."
 msgstr ""
 
-#: ../actions/recoverpassword.php:189
+#: ../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/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
 msgid "No request found!"
 msgstr "İstek bulunamadı!"
 
 #: ../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/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr ""
 
-#: ../actions/openidsettings.php:135
+#: ../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/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+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 "Böyle bir OpenID yok."
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
 msgstr "Böyle bir belge yok."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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/recoverpassword.php:56
+#: ../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/postnotice.php:56
+#: ../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:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/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."
 
-#: ../lib/gallery.php:76
+#: ../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 "Gösterecek hiç kimse yok!"
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+#: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr "Bir geri alma kodu deÄŸil."
 
-#: ../actions/imsettings.php:158
+#: ../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 "Geçersiz bir Jabber ID"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "Geçersiz bir OpenID."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../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 "Geçersiz bir eposta adresi."
 
-#: ../actions/profilesettings.php:83 ../actions/register.php:61
+#: ../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/remotesubscribe.php:118
+#: ../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/remotesubscribe.php:111
+#: ../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/remotesubscribe.php:104
+#: ../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/avatar.php:95
+#: ../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/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "YetkilendirilmemiÅŸ."
 
 #: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/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 "Giriş yapılmadı."
 
-#: ../actions/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
 
-#: ../actions/showstream.php:82
+#: ../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 için durum RSS beslemesi"
 
-#: ../actions/shownotice.php:39
+#: ../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/showstream.php:297
+#: ../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/password.php:39
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "Eski parola"
 
-#: ../lib/util.php:288
+#: ../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:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73
 msgid "OpenID Account Setup"
 msgstr "OpenID Hesabı Kurulumu"
 
-#: ../lib/openid.php:180 lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
 msgid "OpenID Login"
 msgstr "OpenID GiriÅŸi"
 
 #: ../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/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/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"
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID hatası: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "OpenID ayarları"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "Kısmi yükleme."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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/recoverpassword.php:249
+#: ../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/recoverpassword.php:245
+#: ../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/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../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/password.php:89 ../actions/recoverpassword.php:274
+#: ../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/password.php:61 ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../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"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "KiÅŸi Arama"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "KiÅŸisel"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/userauthorization.php:78
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"Lütfen bu kullanıcının durumunu takip etmek istediğinizden emin olmak "
-"için detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde "
+"Lütfen bu kullanıcının durumunu takip etmek istediğinizden emin olmak için "
+"detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde "
 "bulunmadıysanız \"İptal\" tuşuna basın. "
 
-#: ../actions/imsettings.php:74
+#: ../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 durum mesajim deÄŸiÅŸtiÄŸinde nedurum.com'da durumumu "
-"güncelle"
+"Jabber/GTalk durum mesajim değiştiğinde nedurum.com'da durumumu güncelle"
 
-#: ../actions/imsettings.php:68
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
-#: ../lib/util.php:300
+#: ../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 "Gizlilik"
 
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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."
 
-#: ../lib/stream.php:54
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "Profil Adresi"
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
 msgid "Profile settings"
 msgstr "Profil ayarları"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Genel"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Genel Durum Akış RSS Beslemesi"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "Genel zaman çizgisi"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr "Geri al"
 
-#: ../actions/recoverpassword.php:141
+#: ../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:67
+#: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr "Bilinmeye kullanıcı için geri alma kodu"
 
-#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: 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/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "Reddet"
 
-#: ../actions/login.php:99 ../actions/register.php:183
+#: ../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/updateprofile.php:69 ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "Uzaktan abonelik"
 
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: 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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "OpenID'yi kaldır"
 
@@ -1065,48 +1908,89 @@ msgstr ""
 "OpenID'nizi sistemden silerseniz giriş yapamazsınız! Eğer silmek "
 "istiyorsanuz, önce yeni bir OpenID ekleyin"
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
 msgid "Replies"
 msgstr "Cevaplar"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../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 için cevaplar"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "Sıfırla"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "Parolayı sıfırla"
 
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+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/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../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 "Kaydet"
 
-#: ../lib/searchaction.php:73 ../lib/util.php:277
+#: ../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/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr ""
 
-#: ../actions/noticesearch.php:30
+#: ../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%%'da durum mesajlarının içeriğinde arama yap. Anahtar "
-"kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya daha fazla "
-"karakterden oluşmalı."
+"%%site.name%%'da durum mesajlarının içeriğinde arama yap. Anahtar kelimeleri "
+"boşluk ile ayırın. Anahtar kelime 3 veya daha fazla karakterden oluşmalı."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1114,152 +1998,283 @@ msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"%%site.name%% üyeleri arasında isim, yer ya da ilgi alanları içinde "
-"arama yap. Anahtar kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya "
-"daha fazla karakterden oluşmalı. "
+"%%site.name%% üyeleri arasında isim, yer ya da ilgi alanları içinde arama "
+"yap. Anahtar kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya daha fazla "
+"karakterden oluşmalı. "
 
-#: ../lib/util.php:982
+#: ../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 "Gönder"
 
-#: ../actions/imsettings.php:71
+#: ../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 "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 
-#: ../lib/util.php:282
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "Ayarlar kaydedildi."
 
-#: ../actions/finishaddopenid.php:66
+#: ../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 "Bir başkası zaten bu OpenID'ye sahip."
 
 #: ../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."
 
-#: ../lib/util.php:302
+#: ../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 "Kaynak"
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "Ä°statistikler"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../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/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../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/showstream.php:294 ../actions/subscribers.php:27
+#: ../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/userauthorization.php:309
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "Takip talebine izin verildi"
 
-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
 msgstr "Abonelik reddedildi."
 
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../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/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
 msgid "System error uploading file."
 msgstr "Dosya yüklemede sistem hatası."
 
-#: ../actions/noticesearch.php:34
+#: ../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 "Metin arama"
 
-#: ../actions/openidsettings.php:140
+#: ../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/confirmaddress.php:52
+#: ../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/confirmaddress.php:43
+#: ../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/avatar.php:80
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "Dosya çok büyük."
 
-#: ../actions/imsettings.php:161
+#: ../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/imsettings.php:224
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+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/imsettings.php:201
+#: ../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 "Yanlış IM adresi."
 
-#: ../actions/newnotice.php:52
+#: ../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 ""
-"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne "
-"dersiniz?"
+"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:62
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" adresi hesabınız için onaylandı."
 
-#: ../actions/imsettings.php:241
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: 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/userauthorization.php:311 ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: ../actions/userauthorization.php:321 ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "%s adlı kullanıcının durumunu takip edenler"
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Sizin durumunuzu takip edenler"
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "%s adlı kullanıcının durumlarını takip ettiği kullanıcılar"
 
-#: ../actions/subscriptions.php:33
+#: ../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/recoverpassword.php:87
+#: ../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/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."
 
@@ -1271,7 +2286,8 @@ 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/finishopenidlogin.php:56
+#: ../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 "
@@ -1279,45 +2295,90 @@ msgid ""
 "your existing account, if you have one."
 msgstr ""
 "%s'a İlk defa giriş yapıyorsunuz. Bu yüzden OpenID'nizi hesabınıza "
-"bağlamamız gerekli. Bunun için ya yeni bir hesap oluşturabilirsiniz ya "
-"da varolan hesabınızı kullanabilirsiniz. "
+"bağlamamız gerekli. Bunun için ya yeni bir hesap oluşturabilirsiniz ya da "
+"varolan hesabınızı kullanabilirsiniz. "
 
-#: ../lib/util.php:147
+#: ../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 "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/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:132
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
-#: ../actions/profilesettings.php:51
+#: ../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 ""
-"Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin "
-"adresi"
+"Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
+#: actions/remotesubscribe.php:110
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/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/recoverpassword.php:237
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323
 msgid "Unexpected password reset."
 msgstr "Beklemeğen parola sıfırlaması."
 
+#: ../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 protokolünün bilinmeğen sürümü."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1325,24 +2386,52 @@ 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:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Tanınmayan adres türü %s"
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Aboneliği sonlandır"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../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/avatar.php:105
+#: ../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/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "Yükle"
 
@@ -1354,114 +2443,212 @@ msgid ""
 "share."
 msgstr ""
 "Buradan yeni bir \"avatar\" (kullanıcı resmi) yükleyin. Resminizi "
-"yükledikten sonra düzenleyemezsiniz bu sebeple kare biçimine yakın "
-"olmasına özen gösterin. Buna ek olarak, resminiz sitenin lisansına tabi "
-"olmalıdır. Kendinize ait olan ve paylaşmak istediğiniz bir resim kullanın. "
+"yükledikten sonra düzenleyemezsiniz bu sebeple kare biçimine yakın olmasına "
+"özen gösterin. Buna ek olarak, resminiz sitenin lisansına tabi olmalıdır. "
+"Kendinize ait olan ve paylaşmak istediğiniz bir resim kullanın. "
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../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 ""
-"Sadece sistem güncellemeleri, duyurular ve parola geri alma için "
-"kullanılır."
+"Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır."
 
 #: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88
+#: 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:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../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/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "Kullanıcı takma adı"
 
-#: ../lib/util.php:969
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
 msgstr "N'aber %s?"
 
-#: ../actions/profilesettings.php:57
+#: ../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/updateprofile.php:127
+#: ../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/updateprofile.php:122
+#: ../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/finishaddopenid.php:64
+#: ../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 "Zaten bu OpenID'ye sahipsiniz!"
 
-#: ../actions/recoverpassword.php:31
+#: ../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 "Zaten giriş yapmış durumdasıznız!"
 
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Parolanızı burada değiştirebilirsiniz. İyi bir tane seçin!"
 
-#: ../actions/register.php:164
+#: ../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."
+"Sizde bir hesap açıp durumunuzdan arkadaşlarınızı haberdar edebilirsiniz."
+
+#: ../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/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"\"Sil\" düğmesine basarak hesabınızdan eklediğiniz OpenID'yi "
-"silebilirsiniz."
+"\"Sil\" düğmesine basarak hesabınızdan eklediğiniz OpenID'yi silebilirsiniz."
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
 "Jabber/GTalk kullanarak durum mesaji gÖnderip alabilirsiniz. IM adres "
 "ayarlarinizi aşağıda yapın."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"Burada kişisel profilinizi güncelleyebilirsiniz, böylelikle insanlar "
-"sizin hakkınızda daha fazla bilgi sahibi olur."
+"Burada kişisel profilinizi güncelleyebilirsiniz, böylelikle insanlar sizin "
+"hakkınızda daha fazla bilgi sahibi olur."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: 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/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../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/updateprofile.php:62
+#: ../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/recoverpassword.php:134
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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 "Harika, sizi tanıdık. Simdi yeni parolanızı girin."
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "OpenID URLniz"
 
-#: ../actions/recoverpassword.php:149
+#: ../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."
 
@@ -1474,1369 +2661,2213 @@ 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:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "birkaç saniye önce"
 
-#: ../lib/util.php:826
+#: ../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"
 
-#: ../lib/util.php:822
+#: ../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"
 
-#: ../lib/util.php:818
+#: ../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"
 
-#: ../lib/util.php:830
+#: ../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"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "yaklaşık bir gün önce"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "yaklaşık bir dakika önce"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "yaklaşık bir ay önce"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "yaklaşık bir yıl önce"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "yaklaşık bir saat önce"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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 "...cevap olarak"
 
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "cevapla"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "yukaridaki parola ile aynı"
 
-#: ../lib/util.php:1127
+#: ../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 "« Sonra"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
+#: 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/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: 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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
+msgid "%s favorite notices"
 msgstr ""
 
-#: ../actions/invite.php:168 actions/invite.php:176
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
+msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+#: 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:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
+#: actions/login.php:122 actions/login.php:264
+msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
+#: actions/login.php:126 actions/login.php:268
+msgid "Login with your username and password. "
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
+#: 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/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
+#: 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/register.php:213
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+msgid "No such user"
 msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
+#: actions/newmessage.php:117 actions/newmessage.php:67
+msgid "New message"
 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/noticesearch.php:95 actions/noticesearch.php:146
+msgid "Notice without matching profile"
 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/openidsettings.php:28 actions/openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+#: actions/outbox.php:53 actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+"Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
+msgid "You can update your personal profile info here "
 msgstr ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
+#: 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/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+msgid "This confirmation code is too old. "
 msgstr ""
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
 msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
 msgstr ""
 
-#: ../actions/register.php:202
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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...\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."
+"want to..."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: 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 "Could not follow user: %s is already on your list."
+msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
 msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
+#: actions/showstream.php:154
+msgid "Send a message"
 msgstr ""
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, php-format
+msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#, php-format
+msgid "Direct messages to %s"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
+msgid "No message text!"
 msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
+#: 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/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
-msgid "Feed for tag %s"
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
+#: 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 ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
+#: 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 ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+msgid "Twitter settings"
 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/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+msgid "Current verified Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
 msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
 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/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
+msgid "Unable to save your Twitter settings!"
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+msgid "Twitter settings saved."
 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/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
+msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
+#: 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/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+msgid "Twitter preferences saved."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
+msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
+msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+msgid "Command results"
 msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
+#: classes/Command.php:96 classes/Command.php:113
+#, php-format
+msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
+msgid "User has no last notice"
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
+#: classes/Command.php:146 classes/Command.php:166
+msgid "Notice marked as fave."
 msgstr ""
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
-msgid "Notices tagged with %s"
+msgid "Homepage: %s"
 msgstr ""
 
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
 msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
+#: classes/Command.php:295 classes/Command.php:335
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: 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:28 actions/register.php:28
-msgid "Registration not allowed."
+#: classes/Command.php:313 classes/Command.php:356
+msgid "Notification off."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
+#: classes/Message.php:53 classes/Message.php:56
+msgid "Could not insert message."
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
+#: classes/Message.php:63 classes/Message.php:66
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
 msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: lib/mail.php:253 lib/mail.php:512
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: lib/mailbox.php:43 lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: lib/openid.php:195 lib/openid.php:203
+msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+msgid "Favorites"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
 msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
 msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
+msgid "Twitter"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
+msgid "Twitter integration options"
 msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+msgid "Could not parse message."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
+#: 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."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Ayarlar"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "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 ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
 msgstr ""
 
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
+#: actions/avatarsettings.php:334 actions/grouplogo.php:391
+#: classes/User_group.php:112
+#, 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 ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/block.php:129
+msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/block.php:162
+#, 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 ""
+
+#: actions/confirmaddress.php:159
+#, fuzzy, php-format
+msgid "The address \"%s\" has been "
+msgstr "Bu adres kaldırılmıştı."
+
+#: actions/deletenotice.php:73
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
 #, php-format
-msgid "Updates from %1$s on %2$s!"
+msgid "Edit %s group"
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: 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/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: 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/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/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:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
 msgstr ""
+"Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
+"kullanılamaz. "
 
-#: ../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/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Kullanıcı güncellenemedi."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "Ayarlar kaydedildi."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Onay kodu hatası."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/emailsettings.php:321
+#, fuzzy
+msgid "That email address already belongs "
+msgstr "Eposta adresi zaten var."
+
+#: actions/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
+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/facebookhome.php:196
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "If you would like the %s app to automatically update "
 msgstr ""
 
-#: ../lib/mail.php:147
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, 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 "Allow %s to update my Facebook status"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: actions/facebookhome.php:218
+msgid "Skip"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31
+#: actions/facebookhome.php:235
+#, fuzzy
+msgid "No notice content!"
+msgstr "İçerik yok!"
+
+#: 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
+#, fuzzy
+msgid "After"
+msgstr "« Sonra"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#, fuzzy
+msgid "Before"
+msgstr "Önce »"
+
+#: actions/facebookinvite.php:70
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
 msgstr ""
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "Kullanıcı güncellenemedi."
+
+#: actions/facebooksettings.php:65
+msgid "There was a problem saving your sync preferences!"
 msgstr ""
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Tercihler kaydedildi."
+
+#: actions/facebooksettings.php:90
+msgid "Automatically update my Facebook status with my notices."
 msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Favor"
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Profil"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
 msgstr ""
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Tercihler"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+#, fuzzy
+msgid "Popular notices"
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/featured.php:71
 #, php-format
-msgid "%s favorite notices"
+msgid "Featured users, page %d"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/featured.php:99
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/inbox.php:28
-#, php-format
-msgid "Inbox for %s - page %d"
+#: actions/finishremotesubscribe.php:188
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/inbox.php:30
-#, php-format
-msgid "Inbox for %s"
+#: actions/groupbyid.php:79
+msgid "No ID"
 msgstr ""
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+msgid "Group logo"
 msgstr ""
 
-#: actions/invite.php:178
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
+#: 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
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: actions/login.php:126
-msgid "Login with your username and password. "
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
 msgstr ""
 
-#: actions/newmessage.php:65
-msgid "No recipient specified."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
+#: actions/groups.php:90
+#, php-format
+msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#, fuzzy
+msgid "Create a new group"
+msgstr "Yeni hesap oluÅŸtur"
+
+#: actions/groupsearch.php:57
+#, fuzzy, php-format
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Search for groups on %%site.name%% by their name, location, or description. "
 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/newmessage.php:108
-msgid "No such user"
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "KiÅŸi Arama"
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
 msgstr ""
 
-#: actions/newmessage.php:117
-msgid "New message"
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
 msgstr ""
 
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
+#: actions/imsettings.php:147
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk "
+msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Onay kodu yok."
+
+#: actions/joingroup.php:65
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/openidsettings.php:28
+#: actions/joingroup.php:95
+#, 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"
+
+#: actions/joingroup.php:135
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgid "%s joined group %s"
 msgstr ""
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/leavegroup.php:65
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Bize o profili yollamadınız"
+
+#: actions/leavegroup.php:100
+msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/outbox.php:28
-#, php-format
-msgid "Outbox for %s - page %d"
+#: actions/leavegroup.php:130
+msgid "Could not find membership record."
 msgstr ""
 
-#: actions/outbox.php:30
+#: 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
 #, php-format
-msgid "Outbox for %s"
+msgid "%s left group %s"
 msgstr ""
 
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
 msgstr ""
 
-#: actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
+#: 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
+#, fuzzy
+msgid "That's too long. "
+msgstr "Dosya çok büyük."
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "Durum mesajları"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
 msgstr ""
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
+#: actions/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "OpenID GiriÅŸi"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "OpenID'yi kaldır"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Ayarlar"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
 msgstr ""
 
-#: actions/register.php:216
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "Ara"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Parolayı değiştir"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "Parola kaydedildi."
+
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Geçersiz bir eposta adresi."
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:91
 #, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "Profil bilinmiyor"
+
+#: actions/profilesettings.php:124
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/profilesettings.php:144
+msgid "Automatically subscribe to whoever "
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: 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."
+msgstr ""
+
+#: actions/public.php:220
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
 
-#: actions/showfavorites.php:61
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Genel Durum Akış RSS Beslemesi"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Feed for favorites of %s"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/showmessage.php:33
-msgid "No such message."
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/register.php:149
+#, 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 ""
 
-#: actions/showmessage.php:61
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: actions/register.php:368
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, "
+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, "
+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, "
+msgstr ""
+"Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi"
+
+#: actions/register.php:404
+#, 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"
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
 msgstr ""
+"bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
+"numarası."
 
-#: actions/showmessage.php:66
+#: actions/register.php:471
 #, php-format
-msgid "Message from %1$s on %2$s"
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: 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
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "%s için cevaplar"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/smssettings.php:312
+#: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
-msgid "Mobile carrier for your phone. "
+msgid "%s group"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/showgroup.php:79
 #, php-format
-msgid "Direct messages to %s"
+msgid "%s group, page %d"
+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"
+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"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
+msgid "Members"
+msgstr "Üyelik başlangıcı"
+
+#: 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/showgroup.php:370
+msgid "All members"
+msgstr ""
+
+#: actions/showgroup.php:378
 #, php-format
-msgid "All the direct messages sent to %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/showstream.php:73
 #, php-format
-msgid "All the direct messages sent from %s"
+msgid "%s, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
+#: 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"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
+#: actions/showstream.php:317
+msgid "User actions"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Abone olanlar"
+
+#: actions/showstream.php:533
+msgid "All groups"
 msgstr ""
 
-#: actions/twitapifavorites.php:92
+#: actions/showstream.php:542
 #, php-format
-msgid "%s / Favorites from %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+
+#: actions/smssettings.php:128
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, "
+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"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: 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
 #, php-format
-msgid "%s updates favorited by %s / %s."
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: 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
+#, 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"
+
+#: actions/subscriptions.php:122
+#, fuzzy
+msgid "Jabber"
+msgstr "JabberID yok."
+
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "%s adli kullanicinin durum mesajlari"
+
+#: actions/tag.php:66
 #, php-format
-msgid "%s added your notice as a favorite"
+msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: 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."
+
+#: actions/tagother.php:65
 #, php-format
+msgid "Tag %s"
+msgstr ""
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr ""
+
+#: actions/tagother.php:149
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/tagother.php:164
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/tagother.php:191
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
+#: 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."
 msgstr ""
 
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "%s adli kullanicinin durum mesajlari"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
 msgstr ""
 
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "İstek bulunamadı!"
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Yeni parola"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
 msgstr ""
 
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
 msgstr ""
 
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
+#: actions/twittersettings.php:341
+#, fuzzy, php-format
+msgid "Unable to retrieve account information "
+msgstr "Eposta onayı silinemedi."
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Kullanıcıyı kaydetmede hata oluştu."
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Yetkilendirme isteÄŸi yok!"
+
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
 msgstr ""
 
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Aboneliği sonlandır"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
+msgstr ""
+
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Durum mesajını kaydederken hata oluştu."
+
+#: classes/Notice.php:109
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Avatar güncellemede hata."
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr ""
+
+#: lib/action.php:130
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgid "%s - %s"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
+#: lib/action.php:145
+msgid "Untitled page"
 msgstr ""
 
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
+#: lib/action.php:316
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
+#: lib/action.php:325
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "Hakkında"
+
+#: lib/action.php:328
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
+#: lib/action.php:332
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
+#: lib/action.php:335
+msgid "Login to the site"
 msgstr ""
 
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Yeni hesap oluÅŸtur"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "Böyle bir OpenID yok."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Yardım"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "Yeni durum mesajı"
+
+#: lib/action.php:417
+msgid "Local views"
 msgstr ""
 
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "Yeni durum mesajı"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Abonelikler"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
 msgstr ""
 
-#: classes/Channel.php:113
-msgid "Command results"
+#: lib/action.php:630
+msgid "All "
 msgstr ""
 
-#: classes/Channel.php:148
-msgid "Command complete"
+#: lib/action.php:635
+msgid "license."
 msgstr ""
 
-#: classes/Channel.php:158
-msgid "Command failed"
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Böyle bir kullanıcı yok."
+
+#: lib/blockform.php:153
+msgid "Block"
 msgstr ""
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
 msgstr ""
 
-#: classes/Command.php:96
+#: lib/facebookaction.php:268
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
+#: 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/feedlist.php:64
+msgid "Export data"
 msgstr ""
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
+#: lib/galleryaction.php:121
+msgid "Filter tags"
 msgstr ""
 
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
+#: lib/galleryaction.php:131
+msgid "All"
 msgstr ""
 
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
+#: lib/galleryaction.php:137
+msgid "Tag"
 msgstr ""
 
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
+#: lib/galleryaction.php:139
+msgid "Go"
 msgstr ""
 
-#: classes/Command.php:178
-#, php-format
-msgid "About: %s"
+#: lib/groupeditform.php:148
+#, 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
+#, fuzzy
+msgid "Description"
+msgstr "Abonelikler"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
+
+#: lib/groupeditform.php:158
+#, 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"
 msgstr ""
 
-#: classes/Command.php:200
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Edit %s group properties"
 msgstr ""
 
-#: classes/Command.php:214
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Çıkış"
+
+#: lib/groupnav.php:107
 #, php-format
-msgid "Direct message to %s sent"
+msgid "Add or edit %s logo"
 msgstr ""
 
-#: classes/Command.php:216
-msgid "Error sending direct message."
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
 msgstr ""
 
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
 msgstr ""
 
-#: classes/Command.php:270
+#: lib/grouptagcloudsection.php:56
 #, php-format
-msgid "Subscribed to %s"
+msgid "Tags in %s group's notices"
 msgstr ""
 
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "GiriÅŸ"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Kaydet"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Geçersiz kullanıcı adı veya parola."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Yeni hesap oluÅŸtur"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
 msgstr ""
 
-#: classes/Command.php:295
+#: lib/mail.php:175
 #, php-format
-msgid "Unsubscribed from %s"
+msgid ""
+"Hey, %s.\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s %2$s'da durumunuzu takip ediyor"
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Yer"
+
+#  Belki Durum Merkezi falan denebilir mi ki?
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Başlangıç Sayfası"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
 msgstr ""
 
-#: classes/Command.php:313
-msgid "Notification off."
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
 msgstr ""
 
-#: classes/Command.php:315
-msgid "Can't turn off notification."
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr ""
 
-#: classes/Command.php:333
-msgid "Notification on."
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s %2$s'da durumunuzu takip ediyor"
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
 msgstr ""
 
-#: classes/Command.php:335
-msgid "Can't turn on notification."
+#: lib/messageform.php:110
+msgid "Send a direct notice"
 msgstr ""
 
-#: classes/Command.php:344
-msgid "Commands:\n"
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "Yeni durum mesajı"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 veya daha fazla karakter"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "...cevap olarak"
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
 msgstr ""
 
-#: classes/Message.php:53
-msgid "Could not insert message."
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "cevapla"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+msgid "Delete this notice"
 msgstr ""
 
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
+#: lib/noticelist.php:474
+msgid "Delete"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
 msgstr ""
 
-#: lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: lib/nudgeform.php:128
+msgid "Nudge"
 msgstr ""
 
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/personaltagcloudsection.php:56
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
+#: lib/profilelist.php:182
+msgid "(none)"
 msgstr ""
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
-msgstr ""
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Genel"
 
-#: lib/personal.php:65
-msgid "Favorites"
+#: lib/publicgroupnav.php:80
+msgid "User groups"
 msgstr ""
 
-#: lib/personal.php:66
-#, php-format
-msgid "%s's favorite notices"
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
 msgstr ""
 
-#: lib/personal.php:66
-msgid "User"
+#: lib/publicgroupnav.php:86
+msgid "Featured"
 msgstr ""
 
-#: lib/personal.php:75
-msgid "Inbox"
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "KiÅŸi Arama"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Durum mesajları"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
 msgstr ""
 
-#: lib/personal.php:76
-msgid "Your incoming messages"
+#: lib/section.php:89
+msgid "Untitled section"
 msgstr ""
 
-#: lib/personal.php:80
-msgid "Outbox"
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Uzaktan abonelik"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Uzaktan abonelik"
+
+#: lib/subgroupnav.php:97
+#, php-format
+msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/personal.php:81
-msgid "Your sent messages"
+#: lib/subgroupnav.php:104
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/settingsaction.php:99
-msgid "Twitter"
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Kullanıcının profili yok."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Takip talebine izin verildi"
+
+#: lib/tagcloudsection.php:56
+msgid "None"
 msgstr ""
 
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
+#: lib/topposterssection.php:74
+msgid "Top posters"
 msgstr ""
 
-#: lib/util.php:1718
-msgid "To"
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "Böyle bir kullanıcı yok."
+
+#: lib/unblockform.php:150
+msgid "Unblock"
 msgstr ""
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "Yeni hesap oluÅŸtur"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Eposta onaylanamadı."
+
+#~ msgid "Email address"
+#~ msgstr "Eposta adresi"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Durum gönderilirken hata oluştu"
+
+#~ 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."
diff --git a/locale/uk_UA/LC_MESSAGES/laconica.mo b/locale/uk_UA/LC_MESSAGES/laconica.mo
index 15d92e5aa..1f1f5ad54 100644
--- a/locale/uk_UA/LC_MESSAGES/laconica.mo
+++ b/locale/uk_UA/LC_MESSAGES/laconica.mo
diff --git a/locale/uk_UA/LC_MESSAGES/laconica.po b/locale/uk_UA/LC_MESSAGES/laconica.po
index 329397dbb..abd50e81b 100644
--- a/locale/uk_UA/LC_MESSAGES/laconica.po
+++ b/locale/uk_UA/LC_MESSAGES/laconica.po
@@ -7,62 +7,88 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  laconica.po  #-#-#-#-#\n"
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-29 20:02+1200\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Kostyantyn Bakarzhiev <boogie@e-mail.ua>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Ukrainian\n"
-"X-Poedit-Country: UKRAINE\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.po  #-#-#-#-#\n"
+"X-Poedit-Language: Ukrainian\n"
+"X-Poedit-Country: UKRAINE\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Потік пошуку дл� \"%s\""
 
-#: ../actions/tag.php:139
-msgid " by "
-msgstr "від"
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:255
+#: ../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."
+" 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 ""
-"окрім цих приватних даних: пароль, "
-"електронна адре�а, адре�а IM, телефонний номер."
 
-#: ../actions/twitapistatuses.php:469
+#: ../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/tag.php:127
+#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
 #, php-format
-msgid "%1$s Notices recently tagged with %2$s"
-msgstr "%1$s Повідомленн� щойно позначені з %2$s"
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
 
-#: ../lib/mail.php:120
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 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:122
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -72,296 +98,436 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
-"%1$s тепер �лідкує за вашими повідомлен�ми "
-"на %2$s.\n\n\t%3$s\n\nЩиро ваші,\n%4$s.\n"
+"%1$s тепер �лідкує за вашими повідомлен�ми на %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Щиро ваші,\n"
+"%4$s.\n"
 
-#: ../actions/twitapistatuses.php:473
+#: ../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:45
+#: actions/shownotice.php:161
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s має �тату� на %2$s"
 
-#: ../actions/publicrss.php:60
+#: ../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 ""
+
+#: ../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:235 ../lib/stream.php:51
+#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
+#: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
+#: 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/twitapistatuses.php:49
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33
 #, php-format
 msgid "%s public timeline"
 msgstr "%s �пільний ча�овий потік"
 
-#: ../lib/mail.php:202
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
 msgid "%s status"
 msgstr "%s �тату�"
 
-#: ../actions/twitapistatuses.php:335
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
 #, php-format
 msgid "%s timeline"
 msgstr "%s ча�овий потік"
 
-#: ../actions/twitapistatuses.php:52
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s оновленн� від в�іх!"
 
-#: ../actions/register.php:277
+#: ../actions/register.php:213
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
-"(Ви маєте негайно отримати ли�та "
-"електронною поштою, в �кому будуть ін�трукції, �к підтвердити вашу електронну адре�у.)"
+"(Ви маєте негайно отримати ли�та електронною поштою, в �кому будуть "
+"ін�трукції, �к підтвердити вашу електронну адре�у.)"
 
-#: ../lib/util.php:244
+#: ../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%%). "
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** це �ерві� мікроблогів наданий "
-"вам [%%site.broughtby%%](%%site.broughtbyurl%%)."
+"**%%site.name%%** це �ерві� мікроблогів наданий вам [%%site.broughtby%%](%%"
+"site.broughtbyurl%%)."
 
-#: ../lib/util.php:246
+#: ../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:261
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
-". Контрибутори мають бути зазначені "
-"повним ім'�м або ім'�м кори�тувача."
+". Контрибутори мають бути зазначені повним ім'�м або ім'�м кори�тувача."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: 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:221
+#: ../actions/register.php:152 actions/register.php:166
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
-"1-64 букви нижнього регі�тра і цифри, "
-"ні�кої пунктуації або інтервалів. �еодмінно."
+"1-64 букви нижнього регі�тра і цифри, ні�кої пунктуації або інтервалів. "
+"�еодмінно."
 
-#: ../actions/password.php:42
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
 msgid "6 or more characters"
 msgstr "6 або більше знаків"
 
-#: ../actions/recoverpassword.php:165
+#: ../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:223
+#: ../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:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
-"Код підтвердженн� був відправлений на "
-"адре�у IM, �ку ви додали. Ви повинні �хвалити %s дл� відправленн� вам повідомлень."
+"Код підтвердженн� був відправлений на адре�у IM, �ку ви додали. Ви повинні "
+"�хвалити %s дл� відправленн� вам повідомлень."
 
-#: ../actions/emailsettings.php:213
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"Код підтвердженн� був відправлений на "
-"електронну адре�у, �ку ви додали. "
-"Перевірте вхідну пошту (і теку зі �памом також!), там має бути код та подальші ін�трукції."
+"Код підтвердженн� був відправлений на електронну адре�у, �ку ви додали. "
+"Перевірте вхідну пошту (і теку зі �памом також!), там має бути код та "
+"подальші ін�трукції."
 
-#: ../actions/smssettings.php:216
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your inbox "
 "(and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"Код підтвердженн� був відправлений на "
-"телефонний номер, �кий ви додали. "
+"Код підтвердженн� був відправлений на телефонний номер, �кий ви додали. "
 "Перевірте вхідні повідомленн�, там має бути код та подальші ін�трукції."
 
-#: ../lib/util.php:310
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
 msgstr "Про"
 
-#: ../actions/userauthorization.php:119
+#: ../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: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 ""
+
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92
 msgid "Address"
 msgstr "�дре�а"
 
-#: ../actions/showstream.php:273
+#: ../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:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
 #, php-format
 msgid "All updates for %s"
 msgstr "В�і оновленн� дл� %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../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 "Тепер ви увійшли."
 
-#: ../actions/subscribe.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "Тепер ви підпи�ані!"
 
-#: ../actions/deletenotice.php:54
+#: ../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:77 actions/userauthorization.php:83
+#: actions/userauthorization.php:81
 msgid "Authorize subscription"
 msgstr "�вторизувати підпи�ку"
 
-#: ../actions/login.php:104 ../actions/register.php:242
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "�втоматично входити у майбутньому; не дл� "
 
-#: ../actions/profilesettings.php:65
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
-"�втоматично підпи�увати�ь до тих, хто "
-"підпи�ав�� до мене (�кщо ви бот, це �аме дл� ва�)"
+"�втоматично підпи�увати�ь до тих, хто підпи�ав�� до мене (�кщо ви бот, це "
+"�аме дл� ва�)"
 
-#: ../actions/avatar.php:32
+#: ../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/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
 msgstr "�ватару оновлено."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"Очікуванн� підтвердженн� цієї адре�и. "
-"Перевірте �вій Jabber/GTalk рахунок, там має "
-"бути повідомленн� з подальшими ін�трукці�ми. (Ви додали %s до вашого �пи�ку контактів?)"
+"Очікуванн� підтвердженн� цієї адре�и. Перевірте �вій Jabber/GTalk рахунок, "
+"там має бути повідомленн� з подальшими ін�трукці�ми. (Ви додали %s до вашого "
+"�пи�ку контактів?)"
 
-#: ../actions/emailsettings.php:54
+#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
-"Очікуванн� підтвердженн� цієї адре�и. "
-"Перевірте вхідну пошту (і теку зі �памом також!), там має бути повідомленн� з подальшими ін�трукці�ми."
+"Очікуванн� підтвердженн� цієї адре�и. Перевірте вхідну пошту (і теку зі "
+"�памом також!), там має бути повідомленн� з подальшими ін�трукці�ми."
 
-#: ../actions/smssettings.php:58
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+#: actions/smssettings.php:111
 msgid "Awaiting confirmation on this phone number."
 msgstr "Очікуванн� підтвердженн� телефонного номера."
 
-#: ../lib/util.php:1290
+#: ../lib/util.php:1318 lib/util.php:1452
+#, fuzzy
 msgid "Before »"
 msgstr "Раніше"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:234
+#: ../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:78
-#: ../actions/updateprofile.php:103
+#: ../actions/profilesettings.php:101 ../actions/register.php:82
+#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
+#: actions/register.php:89 actions/updateprofile.php:104
+#: 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:41 lib/deleteaction.php:69
 msgid "Can't delete this notice."
 msgstr "�е можна видалити це повідомленн�."
 
-#: ../actions/updateprofile.php:119
+#: ../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:261
+#: ../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/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:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "�е можна підтвердити �поживчий об'єкт OpenID."
 
-#: ../actions/imsettings.php:163
+#: ../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:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
 msgid "Cannot normalize that email address"
 msgstr "�е можна полагодити цю поштову адре�у"
 
-#: ../actions/password.php:45
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "Змінити"
 
-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Змінити пароль"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:224 ../actions/smssettings.php:65
+#: ../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:86
+#: ../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/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/smssettings.php:63
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
 msgid "Confirmation code"
 msgstr "Код підтвердженн�"
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Код підтвердженн� не знайдено."
 
-#: ../actions/register.php:266
+#: ../actions/register.php:202
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -379,94 +545,134 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"Вітаємо, %s! І ла�каво про�имо до %%%%site.name%%%%. "
-"Звід�и ви, можливо, �хочете...\n"
+"Вітаємо, %s! І ла�каво про�имо до %%%%site.name%%%%. Звід�и ви, можливо, "
+"�хочете...\n"
+"\n"
+"*Подивити�ь [ваш профіль](%s) та напи�ати �воє перше повідомленн�.\n"
+"*Додати [адре�у Jabber/GTalk](%%%%action.imsettings%%%%), так щоб мати змогу "
+"над�илати повідомленн� через �лужбу миттєвих повідомлень.\n"
+"*[Розшукати людей](%%%%action.peoplesearch%%%%), �кі мають �пільні з вами "
+"інтере�и. \n"
+"*Прочитати [додаткову інформацію](%%%%doc.help%%%%), аби переконати�ь, що ви "
+"нічого не пропу�тили. \n"
 "\n"
-"*Подивити�ь [ваш профіль](%s) та напи�ати "
-"�воє перше повідомленн�.\n"
-"*Додати [адре�у Jabber/GTalk](%%%%action.imsettings%%%%), так "
-"щоб мати змогу над�илати повідомленн� "
-"через �лужбу миттєвих повідомлень.\n"
-"*[Розшукати людей](%%%%action.peoplesearch%%%%), �кі "
-"мають �пільні з вами інтере�и. \n*Прочитати [додаткову інформацію](%%%%doc.help%%%%), аби переконати�ь, що ви нічого не пропу�тили. \n\nД�куємо, що зареє�трували�ь у на�, і, �подіваємо�ь, вам �подобаєть�� наш �ерві�."
-
-#: ../actions/finishopenidlogin.php:91
+"Д�куємо, що зареє�трували�ь у на�, і, �подіваємо�ь, вам �подобаєть�� наш "
+"�ерві�."
+
+#: ../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:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
 msgstr "З'єднати�ь викори�товуючи і�нуючий рахунок"
 
-#: ../lib/util.php:318
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../lib/openid.php:178
+#: ../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/twitapifriendships.php:48
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
 msgid "Could not follow user: User not found."
 msgstr "�е вдало�� �лідувати за кори�тувачем: кори�тувача не знайдено."
 
-#: ../lib/openid.php:160
+#: ../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:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166
 msgid "Could not save avatar info"
 msgstr "�е вдало�� зберегти інформацію про аватару"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159
 msgid "Could not save new profile info"
 msgstr "�е вдало�� зберегти інформацію про новий профіль"
 
-#: ../actions/subscribe.php:62
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
 msgid "Could not subscribe other to you."
 msgstr "�е вдало�� підпи�ати іншого до ва�."
 
-#: ../actions/subscribe.php:54
+#: ../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/confirmaddress.php:80 ../actions/emailsettings.php:234
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: actions/confirmaddress.php:126 actions/emailsettings.php:375
+#: actions/imsettings.php:357 actions/smssettings.php:370
 msgid "Couldn't delete email confirmation."
 msgstr "�е вдало�� видалити підтвердженн� поштової адре�и."
 
-#: ../actions/unsubscribe.php:57
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
 msgstr "�е вдало�� видалити підпи�ку."
 
-#: ../actions/remotesubscribe.php:125
+#: ../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."
 msgstr "�е вдало�� отримати токен запиту."
 
 #: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: 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:181 ../actions/twitapiaccount.php:92
+#: ../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:158
+#: ../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 "�е вдало�� оновити запи� кори�тувача."
 
@@ -474,188 +680,237 @@ msgstr "�е вдало�� оновити запи� кори�тувача."
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
 #: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
 #: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: actions/confirmaddress.php:72 actions/emailsettings.php:174
+#: actions/emailsettings.php:277 actions/imsettings.php:146
+#: actions/imsettings.php:251 actions/profilesettings.php:256
+#: actions/smssettings.php:165 actions/smssettings.php:277
+#: 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:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Створити"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
 msgid "Create new account"
 msgstr "Створити новий рахунок"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../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: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:46
+#: actions/smssettings.php:100
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Поточний підтверджений телефонний номер."
 
-#: ../actions/emailsettings.php:44
+#: ../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:356 actions/showstream.php:367
 msgid "Currently"
 msgstr "Поточне"
 
-#: ../classes/Notice.php:72
+#: ../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:1033
+#: ../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:41
+#: actions/deletenotice.php:79
 msgid "Delete notice"
 msgstr "Видалити повідомленн�"
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:236
+#: ../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:226
+#: ../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:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
 msgid "Email Address"
 msgstr "Електронна адре�а"
 
-#: ../actions/emailsettings.php:32
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+#: actions/emailsettings.php:60
 msgid "Email Settings"
 msgstr "�алаштуванн� пошти"
 
-#: ../actions/register.php:69
+#: ../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:90 lib/mail.php:173
 msgid "Email address confirmation"
 msgstr "Підтвердженн� електронної адре�и"
 
-#: ../actions/emailsettings.php:61
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Електронна адре�а, на зразок \"UserName@example.org\""
 
-#: ../actions/recoverpassword.php:176
+#: ../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:64
+#: actions/smssettings.php:119
 msgid "Enter the code you received on your phone."
 msgstr "Введіть код, �кий ви отримали телефоном."
 
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
+#: actions/userauthorization.php:161
 msgid "Error authorizing token"
 msgstr "Помилка токена авторизації"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../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: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/postnotice.php:89
-msgid "Error inserting notice"
-msgstr "Помилка при додаванні повідомленн�"
-
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
 msgid "Error inserting remote profile"
 msgstr "Помилка при додаванні віддаленого профілю"
 
-#: ../actions/recoverpassword.php:201
+#: ../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:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
 msgid "Error saving remote profile"
 msgstr "Помилка при збереженні віддаленого профілю"
 
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../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:237 lib/openid.php:246
 msgid "Error saving the user."
 msgstr "Помилка при збереженні кори�тувача."
 
-#: ../actions/password.php:80
+#: ../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:268 ../actions/register.php:92
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 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: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:79
+#: ../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:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
 msgstr "І�нуюче ім'�"
 
-#: ../lib/util.php:312
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "Пширені запитанн�"
 
-#: ../actions/avatar.php:115
+#: ../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: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:55 actions/tag.php:61
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Живленн� дл� міток %s"
 
-#: ../lib/searchaction.php:105
+#: ../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/searchaction.php:101
+#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Знайти людей на цьому �айті"
 
@@ -664,196 +919,271 @@ msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"З міркувань безпеки, будь ла�ка введіть "
-"ще раз ім'� та пароль, перед тим �к змінювати налатуванн�."
+"З міркувань безпеки, будь ла�ка введіть ще раз ім'� та пароль, перед тим �к "
+"змінювати налатуванн�."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:228
+#: ../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:75
-#: ../actions/updateprofile.php:93
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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:291
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
 msgstr "Допомога"
 
-#: ../lib/util.php:285
+#: ../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:231
+#: ../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:72
+#: ../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:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:173
 msgid "I want to post notices by email."
 msgstr "Я хочу над�илати повідомленн� поштою."
 
-#: ../actions/imsettings.php:60
+#: ../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 "�дре�а IM"
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "�алаштуванн� IM"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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."
+"Якщо ви вже маєте рахунок, увійдіть викори�товуючи ім'� та пароль, щоб "
+"приєднати їх до вашого OpenID."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Якщо ви бажаєте додати OpenID до вашого "
-"рахунку, введіть адре�у в поле нижче і нати�ніть \"Add\"."
+"Якщо ви бажаєте додати OpenID до вашого рахунку, введіть адре�у в поле нижче "
+"і нати�ніть \"Add\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"Якщо ви забули, або загубили �вій пароль, "
-"ви можете отримати новий на електронну адре�у, �ку ви закріпили за �воїм рахунком."
 
 #: ../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:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:443
 msgid "Incoming email address removed."
 msgstr "�дре�у вхідної пошти видалено."
 
-#: ../actions/password.php:69
+#: ../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/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
 msgid "Incorrect username or password."
 msgstr "�еточне ім'� або пароль."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Ін�трукції з відновленн� паролю було "
-"наді�лано на електронну адре�у, �ку ви закріпили за �воїм ранком."
+"Ін�трукції з відновленн� паролю було наді�лано на електронну адре�у, �ку ви "
+"закріпили за �воїм ранком."
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "�едій�на URL-адре�а аватари '%s'"
 
-#: ../actions/updateprofile.php:98
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+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: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:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
 msgid "Invalid notice content"
 msgstr "�едій�ний змі�т повідомленн�"
 
-#: ../actions/postnotice.php:67
+#: ../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:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "�едій�на URL-адре�а повідомленн�"
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "�едій�на URL-адре�а профілю '%s'."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135
 msgid "Invalid profile URL (bad format)"
 msgstr "�едій�на URL-адре�а профілю (неправильний формат)"
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
 msgstr "�едій�ну URL-адре�у профілю було повернуто �ервером."
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "�едій�ний розмір."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:87
-#: ../actions/register.php:103
+#: ../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 "�едій�не ім'� або пароль."
 
-#: ../lib/util.php:248
+#: ../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 [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Серві� працює на [Laconica](http://laconi.ca/) - "
-"програмному забезпеченні дл� "
-"мікроблогів, вер�і� %s, до�тупному під [GNU "
-"Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Серві� працює на [Laconica](http://laconi.ca/) - програмному забезпеченні "
+"дл� мікроблогів, вер�і� %s, до�тупному під [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php: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: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."
+"Jabber або GTalk адре�а, на зразок \"UserName@example.org\". �ле �першу "
+"переконайте��, що додали %s до �пи�ку контактів в �воєму IM-клієнті або в "
+"GTalk."
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:128
 msgid "Language"
 msgstr "Мова"
 
-#: ../actions/profilesettings.php:113
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:217
 msgid "Language is too long (max 50 chars)."
 msgstr "Мова задовга (50 знаків мак�имум)"
 
-#: ../actions/tag.php:133
-msgid "Last message posted: "
-msgstr "О�таннє повідомленн�:"
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:237
+#: ../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:81
-#: ../actions/updateprofile.php:108
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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:298
+#: ../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:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Увійти з [OpenID](%%doc.openid%%)."
@@ -861,40 +1191,45 @@ msgstr "Увійти з [OpenID](%%doc.openid%%)."
 #: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
-"Увійти викри�товуючи ім'� та пароль. Ще не "
-"маєте імені кори�тувача? "
-"[Зареє�трувати](%%action.register%%) новий акаунт, або �пробувати [OpenID](%%action.openidlogin%%)."
+"Увійти викри�товуючи ім'� та пароль. Ще не маєте імені кори�тувача? "
+"[Зареє�трувати](%%action.register%%) новий акаунт, або �пробувати [OpenID](%%"
+"action.openidlogin%%)."
 
-#: ../lib/util.php:296
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Вийти"
 
-#: ../actions/register.php:230
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:393
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Довше ім'�, переважно це ваше \"real\" ім'�"
 
-#: ../actions/login.php:110
+#: ../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."
 msgstr "Створити нову адре�у дл� над�иланн� повідомлень; видалити �тару."
 
-#: ../actions/emailsettings.php:27
+#: ../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:300 actions/showstream.php:315
+#: actions/showstream.php:480
 msgid "Member since"
 msgstr "Разом з нами з"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "Мікроблог від %s"
@@ -905,359 +1240,528 @@ msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
-"Оператор мобільного зв'�зку. Якщо вам "
-"відомий оператор, що підтримує "
-"над�иланн� SMS через електронну пошту, але він тут не вказаний, напишіть нам і ми вне�емо його до �пи�ку."
+"Оператор мобільного зв'�зку. Якщо вам відомий оператор, що підтримує "
+"над�иланн� SMS через електронну пошту, але він тут не вказаний, напишіть нам "
+"і ми вне�емо його до �пи�ку."
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:252
+#: ../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:140
+#: ../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:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:465
 msgid "New incoming email address added."
 msgstr "�ову адре�у дл� вхідних повідомлень додано."
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+#: actions/finishopenidlogin.php:99
 msgid "New nickname"
 msgstr "�ове ім'�"
 
-#: ../actions/newnotice.php:102
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "�ове повідомленн�"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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:275
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "�овий пароль у�пішно збережено. Тепер ви увійшли."
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:220
+#: ../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:65
+#: ../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:63 ../actions/updateprofile.php:77
+#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
+#: actions/register.php:74 actions/updateprofile.php:78
+#: 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:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
 msgstr "Таке ім'� неприпу�тиме."
 
-#: ../actions/remotesubscribe.php:72
+#: ../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:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
 msgid "Nickname or email"
 msgstr "Ім'� або електронна адре�а"
 
-#: ../actions/deletenotice.php:59
+#: ../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:156 actions/imsettings.php:164
+#: actions/imsettings.php:279
 msgid "No Jabber ID."
 msgstr "�емає Jabber ID."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "�емає запиту на авторизацію!"
 
-#: ../actions/smssettings.php:181
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+#: actions/smssettings.php:299
 msgid "No carrier selected."
 msgstr "Оператора не обрано."
 
-#: ../actions/smssettings.php:316
+#: ../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:33
+#: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "�емає коду підтвердженн�."
 
-#: ../actions/newnotice.php:50
+#: ../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: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:32 actions/userbyid.php:70
 msgid "No id."
 msgstr "�емає ID."
 
-#: ../actions/emailsettings.php:271
+#: ../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: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/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: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:189
+#: ../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: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:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "�емає розміру."
 
-#: ../actions/openidsettings.php:135
+#: ../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/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+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 "Такого OpenID немає."
 
-#: ../actions/doc.php:29
+#: ../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
+#: ../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:56
+#: actions/recoverpassword.php:62
 msgid "No such recovery code."
 msgstr "�емає такого коду відновленн�."
 
-#: ../actions/postnotice.php:56
+#: ../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/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/replies.php:57
-#: ../actions/repliesrss.php:35 ../actions/showstream.php:110
-#: ../actions/subscribe.php:44 ../actions/unsubscribe.php:39
-#: ../actions/userbyid.php:36 ../actions/userrss.php:35 ../actions/xrds.php:35
-#: ../lib/gallery.php:57
+#: ../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 "Такого кори�тувача немає."
 
-#: ../lib/gallery.php:80
+#: ../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:60
+#: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr "Це не код оновленн�."
 
-#: ../actions/imsettings.php:167
+#: ../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:131 lib/openid.php:140
 msgid "Not a valid OpenID."
 msgstr "Це не дій�ний OpenID."
 
-#: ../actions/emailsettings.php:185
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:315
 msgid "Not a valid email address"
 msgstr "Це не дій�на електронна адре�а"
 
-#: ../actions/register.php:59
+#: ../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:67
+#: ../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:118
+#: ../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:111
+#: ../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:104 actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:143
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Це не дій�на URL-адре�а профілю (немає документа YADIS)."
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
 msgstr "Це не зображенн�, або файл зіп�овано."
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "�е авторизовано."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 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
+#: ../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/unsubscribe.php:44
+#: ../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:35
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Пошук повідомлень"
 
-#: ../actions/showstream.php:82
+#: ../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:39
+#: actions/shownotice.php:94
 msgid "Notice has no profile"
 msgstr "Повідомленн� не має профілю"
 
-#: ../actions/showstream.php:316
+#: ../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:124
+#: ../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/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "Старий пароль"
 
-#: ../lib/util.php:302
+#: ../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: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:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
 msgstr "�втопідтвердженн� OpenID"
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: 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:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "�евдача OpenID: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "�алаштуванн� OpenID"
 
-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+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:222
+#: ../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:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:335
 msgid "Password and confirmation do not match."
 msgstr "Пароль та підтвердженн� не �півпадають."
 
-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+#: actions/recoverpassword.php:331
 msgid "Password must be 6 chars or more."
 msgstr "Пароль мі�тить 6 або більше знаків."
 
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
 msgid "Password recovery requested"
 msgstr "Запит на відновленн� паролю відправлено."
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../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/password.php:61 ../actions/register.php:84
+#: ../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/searchaction.php:100
+#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Люди"
 
-#: ../actions/opensearch.php:33
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Пошук людей"
 
-#: ../actions/peoplesearch.php:33
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Пошук людей"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "О�оби�те"
 
-#: ../actions/smssettings.php:69
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Телефонний номер та регіональний код, ні�кої пунктуації чи інтервалів"
 
@@ -1267,124 +1771,160 @@ msgid ""
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"Будь ла�ка, перевірте в�і деталі, щоб "
-"упевнити�ь, що ви дій�но бажаєте "
-"підпи�ати�ь на повідомленн� даного "
-"кори�тувача. Якщо ви не збирали�ь підпи�увати�ь ні на чиї повідомленн�, про�то нати�ніть \"Cancel\"."
+"Будь ла�ка, перевірте в�і деталі, щоб упевнити�ь, що ви дій�но бажаєте "
+"підпи�ати�ь на повідомленн� даного кори�тувача. Якщо ви не збирали�ь "
+"підпи�увати�ь ні на чиї повідомленн�, про�то нати�ніть \"Cancel\"."
 
-#: ../actions/imsettings.php:73
+#: ../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/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/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:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:129
 msgid "Preferred language"
 msgstr "Мова, �кій надаєте перевагу"
 
-#: ../lib/util.php:314
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
 msgid "Privacy"
 msgstr "Конфіденційні�ть"
 
-#: ../actions/newnotice.php:62 ../actions/newnotice.php:70
+#: ../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/stream.php:60
+#: ../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:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
 msgid "Profile URL"
 msgstr "URL-адре�а профілю"
 
-#: ../actions/profilesettings.php:34
+#: ../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 "�евідомий профіль"
 
-#: ../lib/util.php:287
-msgid "Public"
-msgstr "Загал"
-
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Живленн� �пільного потоку"
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "Спільний ча�овий потік"
 
-#: ../actions/imsettings.php:79
+#: ../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/emailsettings.php:94
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
 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 actions/tag.php:75
+#: actions/tag.php:76
 msgid "Recent Tags"
 msgstr "�едавні мітки"
 
-#: ../actions/recoverpassword.php:151
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr "Відновити"
 
-#: ../actions/recoverpassword.php:141
+#: ../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:67
+#: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr "Код відновленн� невідомого кори�тувача."
 
-#: ../actions/register.php:216 ../actions/register.php:257 ../lib/util.php:300
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: 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/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
 msgid "Registration not allowed."
 msgstr "Реє�трацію не дозволено."
 
-#: ../actions/register.php:264
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
 msgid "Registration successful"
 msgstr "Реє�траці� у�пішна"
 
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "Забраковано"
 
-#: ../actions/login.php:103 ../actions/register.php:240
+#: ../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/updateprofile.php:70
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
 msgstr "Віддалений профіль без відповідного профілю"
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "Віддалена підпи�ка"
 
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
 #: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "Видалити OpenID"
 
@@ -1393,68 +1933,92 @@ 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/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:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "Скинути"
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
 msgid "Reset password"
 msgstr "Скинути пароль"
 
-#: ../actions/smssettings.php:67
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
 msgid "SMS Phone number"
 msgstr "Телефонний номер"
 
-#: ../actions/smssettings.php:33
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
 msgid "SMS Settings"
 msgstr "�алаштуванн� SMS"
 
-#: ../lib/mail.php:215
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
 msgid "SMS confirmation"
 msgstr "Підтвердженн� SMS"
 
-#: ../actions/recoverpassword.php:167
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
 msgid "Same as password above"
 msgstr "Такий же, �к пароль вище"
 
-#: ../actions/register.php:225
+#: ../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:288
+#: ../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:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "Живленн� потоку пошуку"
 
-#: ../actions/noticesearch.php:30
+#: ../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 знаків або більше."
+"Пошук повідомлень на %%site.name%% за їх змі�том. Відокремлюйте пошукові "
+"умови інтервалами; вони повинні �кладати�ь з 3 знаків або більше."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1462,181 +2026,245 @@ msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Пошук людей на %%site.name%% за їх ім'�м, мі�цем "
-"знаходженн� або інтере�ами. "
-"Відокремлюйте пошукові умови інтервалами; вони повинні �кладати�ь з 3 знаків або більше."
+"Пошук людей на %%site.name%% за їх ім'�м, мі�цем знаходженн� або інтере�ами. "
+"Відокремлюйте пошукові умови інтервалами; вони повинні �кладати�ь з 3 знаків "
+"або більше."
 
-#: ../actions/smssettings.php:296
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: actions/smssettings.php:457
 msgid "Select a carrier"
 msgstr "Оберіть оператора"
 
-#: ../lib/util.php:1144
+#: ../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: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: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 actions/smssettings.php:97
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
-"Повідомл�ти мене за допомогою SMS; Я "
-"розімію, що, можливо, поне�у надмірні витрати від мого мобільного оператора."
+"Повідомл�ти мене за допомогою SMS; Я розімію, що, можливо, поне�у надмірні "
+"витрати від мого мобільного оператора."
 
-#: ../actions/imsettings.php:76
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"�ад�илати також мені відповіді через "
-"Jabber/GTalk від людей, до �ких � не підпи�аний."
+"�ад�илати також мені відповіді через Jabber/GTalk від людей, до �ких � не "
+"підпи�аний."
 
-#: ../lib/util.php:294
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
 msgstr "�алаштуванн�"
 
-#: ../actions/profilesettings.php:189
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
 msgid "Settings saved."
 msgstr "�алаштуванн� збережено."
 
-#: ../actions/tag.php:60
+#: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
 msgstr "Пред�тавлено найбільш попул�рні мітки за минулий тиждень"
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
+#: 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 "Стало�� що�ь погане."
 
-#: ../lib/util.php:316
+#: ../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:296 actions/showstream.php:311
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "Стати�тика"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../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/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:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
 msgstr "Підпи�ку авторизовано"
 
-#: ../actions/userauthorization.php:320
+#: ../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/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/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
 msgid "System error uploading file."
 msgstr "Си�тема відповіла помилкою при завантаженні цього файла."
 
-#: ../actions/tag.php:41 ../lib/util.php:289
+#: ../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 lib/searchaction.php:104
 msgid "Text"
 msgstr "Тек�т"
 
-#: ../actions/noticesearch.php:34
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:67
 msgid "Text search"
 msgstr "Пошук те�кту"
 
-#: ../actions/openidsettings.php:140
+#: ../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:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "Цю адре�у вже було підтверджено."
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
 msgstr "Цей код підтвердженн� не дл� ва�!"
 
-#: ../actions/emailsettings.php:191
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
 msgid "That email address already belongs to another user."
 msgstr "Ц� електронна адре�а належить іншому кори�тувачу."
 
-#: ../actions/avatar.php:80
+#: ../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: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:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
 msgid "That is already your email address."
 msgstr "Це і так вже ваша адре�а."
 
-#: ../actions/smssettings.php:188
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
 msgid "That is already your phone number."
 msgstr "Це і так вже ваш телефонний номер."
 
-#: ../actions/imsettings.php:233
+#: ../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:249
+#: ../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: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:233 actions/smssettings.php:241
+#: actions/smssettings.php:362
 msgid "That is the wrong confirmation number."
 msgstr "Це помилковий код підтвердженн�."
 
-#: ../actions/smssettings.php:191
+#: ../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:53
+#: ../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/confirmaddress.php:88
+#: ../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/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/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 "�дре�у було видалено."
 
@@ -1646,9 +2274,9 @@ msgid ""
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"Підпи�ку було авторизовано, але URL-адре�а "
-"у відповідь не передавала��. Звірте�ь з "
-"ін�трукці�ми на �айті дл� більш конкретної інформації про те, �к авторизувати підпи�ку. Ваш підпи�ний токен:"
+"Підпи�ку було авторизовано, але URL-адре�а у відповідь не передавала��. "
+"Звірте�ь з ін�трукці�ми на �айті дл� більш конкретної інформації про те, �к "
+"авторизувати підпи�ку. Ваш підпи�ний токен:"
 
 #: ../actions/userauthorization.php:322
 msgid ""
@@ -1656,29 +2284,34 @@ msgid ""
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"Підпи�ку було �кинуно, але URL-адре�а у "
-"відповідь не передавала��. Звірте�ь з "
-"ін�трукці�ми на �айті дл� більш конкретної інформації про те, �к �кинути підпи�ку."
+"Підпи�ку було �кинуно, але URL-адре�а у відповідь не передавала��. Звірте�ь "
+"з ін�трукці�ми на �айті дл� більш конкретної інформації про те, �к �кинути "
+"підпи�ку."
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Тут пред�тавлені ті, хто �лідкує за повідомленн�ми від %s."
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr "Тут пред�тавлені ті, хто �лідкує за вашими повідомленн�ми."
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Тут пред�тавлені ті, за чиїми повідомленн�ми �лідкує %s."
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr "Тут пред�тавлені ті, за чиїми повідомленн�ми ви �лідкуєте."
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/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/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
 msgstr "Цей код підтвердженн� за�тарий. Будь ла�ка, розпочніть з початку."
 
@@ -1687,111 +2320,158 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Ц� форма повинна автоматично �ебе "
-"пред�тавити. Якщо цього не �тало��, "
-"нати�ніть на кнопку пред�тавленн� і ви будете перенаправлені до вашого OpenID провайдера."
+"Ц� форма повинна автоматично �ебе пред�тавити. Якщо цього не �тало��, "
+"нати�ніть на кнопку пред�тавленн� і ви будете перенаправлені до вашого "
+"OpenID провайдера."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../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 до локального рахунку. "
-"Ви можете також �творити новий рахунок, або приєднати OpenID до вашого вже і�нуючого рахунку, �кщо ви його маєте."
+"Ви вперше увійшли до %s, так що ми повинні приєднати ваш OpenID до "
+"локального рахунку. Ви можете також �творити новий рахунок, або приєднати "
+"OpenID до вашого вже і�нуючого рахунку, �кщо ви його маєте."
 
-#: ../lib/util.php:151
+#: ../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:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138
 msgid "Timezone"
 msgstr "Ча�овий по��"
 
-#: ../actions/profilesettings.php:107
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
 msgid "Timezone not selected."
 msgstr "Ча�овий по�� не обрано."
 
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
-"Щоб підпи�ати�ь, ви можете "
-"[увійти](%%action.login%%), або "
-"[зареє�трувати](%%action.register%%) новий рахунок. "
-"Якщо ви вже маєте рахунок на [�умі�ному �айті](%%doc.openmublog%%), введіть URL-адре�у вашого профілю."
+"Щоб підпи�ати�ь, ви можете [увійти](%%action.login%%), або [зареє�трувати](%%"
+"action.register%%) новий рахунок. Якщо ви вже маєте рахунок на [�умі�ному "
+"�айті](%%doc.openmublog%%), введіть URL-адре�у вашого профілю."
 
-#: ../actions/twitapifriendships.php:150
+#: ../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:233
+#: ../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: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:237
+#: ../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:256
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
-"Якщо не зазначено інше, автор�ьке право "
-"на вмі�т цього �айту належить контрибуторам і до�тупний під"
+"Якщо не зазначено інше, автор�ьке право на вмі�т цього �айту належить "
+"контрибуторам і до�тупний під"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "�евизнаний тип адре�и %s"
 
-#: ../actions/showstream.php:209
+#: ../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/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr "Формат зображенн� не підтримуєть��."
 
-#: ../lib/twitterapi.php:257 ../lib/twitterapi.php:278
-msgid "Unsupported type"
-msgstr "Тип не підтримуєть��"
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:238
+#: ../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/twitapistatuses.php:338
+#: ../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/avatar.php:68
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/avatarsettings.php:162 actions/grouplogo.php:232
 msgid "Upload"
 msgstr "Завантажити"
 
@@ -1802,78 +2482,118 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Завантажити нову \"avatar\" (зображенн� "
-"кори�тувача) можна тут. Ви не зможете "
-"відредагувати �вою аватару пі�л� "
-"завантаженн�, так що з початку "
-"переконайте��, що вона має більш-менш "
-"квадратну форму. Ваше зображенн� зберігатиметь�� під ліцензією �айту, також. Викори�товуйте зображенн�, �кі належать вам, і �кі ви можете вільно демон�трувати."
+"Завантажити нову \"avatar\" (зображенн� кори�тувача) можна тут. Ви не "
+"зможете відредагувати �вою аватару пі�л� завантаженн�, так що з початку "
+"переконайте��, що вона має більш-менш квадратну форму. Ваше зображенн� "
+"зберігатиметь�� під ліцензією �айту, також. Викори�товуйте зображенн�, �кі "
+"належать вам, і �кі ви можете вільно демон�трувати."
 
-#: ../actions/register.php:227
+#: ../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:78
-#: ../actions/twitapistatuses.php:316 ../actions/twitapistatuses.php:621
+#: ../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/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "Ім'� кори�тувача"
 
-#: ../actions/profilesettings.php:63
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
 msgid "What timezone are you normally in?"
 msgstr "За �ким ча�овим по��ом ви живете?"
 
-#: ../lib/util.php:1131
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
 msgstr "Як �� маєш, %s?"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:239
+#: ../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/updateprofile.php:128
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "�еправильний тип зображенн� дл� '%s'"
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, 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:64
+#: actions/finishaddopenid.php:112
 msgid "You already have this OpenID!"
 msgstr "Ви вже маєте цей OpenID!"
 
-#: ../actions/deletenotice.php:37
+#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
 msgid ""
 "You are about to permanently delete a notice.  Once this is done, it cannot "
 "be undone."
 msgstr ""
-"Ви видал�єте повідомленн� назавжди. Якщо "
-"ви так зробите, це не матиме зворотньої дії."
+"Ви видал�єте повідомленн� назавжди. Якщо ви так зробите, це не матиме "
+"зворотньої дії."
 
-#: ../actions/recoverpassword.php:31
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
+#: actions/recoverpassword.php:36
 msgid "You are already logged in!"
 msgstr "Ви вже в �и�темі!"
 
-#: ../actions/twitapifriendships.php:115
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
 msgid "You are not friends with the specified user."
 msgstr "Ви не є друз�ми із вказаним кори�тувачем."
 
@@ -1881,11 +2601,12 @@ msgstr "Ви не є друз�ми із вказаним кори�туваче
 msgid "You can change your password here. Choose a good one!"
 msgstr "Тут ви можете замінити пароль. Оберіть �обі �кий�ь гарний!"
 
-#: ../actions/register.php:209
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Ви можете �творити новий рахунок, щоб почати пи�ати повідомленн�."
 
-#: ../actions/smssettings.php:28
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Ви можете отримувати SMS через електронну пошту від %%site.name%%."
@@ -1895,40 +2616,43 @@ msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Ви можете видалити OpenID із �вого рахунку, "
-"�кщо нати�нете кнопку \"Remove\"."
+"Ви можете видалити OpenID із �вого рахунку, �кщо нати�нете кнопку \"Remove\"."
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"Ви можете над�илати на отримувати "
-"повідомленн� через Jabber/GTalk [�лужбу "
+"Ви можете над�илати на отримувати повідомленн� через Jabber/GTalk [�лужбу "
 "миттевих повідомлень](%%doc.im%%). Вкажить �вою адре�у і налаштуйте це нижче."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"Ви можете доповнити �вій о�оби�тий "
-"профіль, так що люди знатимуть про ва� більше."
+"Ви можете доповнити �вій о�оби�тий профіль, так що люди знатимуть про ва� "
+"більше."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: 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:57
+#: ../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:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67
 msgid "You did not send us that profile"
 msgstr "Ви не над�илали нам цього профілю"
 
-#: ../lib/mail.php:143
+#: ../lib/mail.php:147
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -1942,24 +2666,42 @@ msgid ""
 msgstr ""
 "Ви маєте нову поштову адре�у на %1$s.\n"
 "\n"
-"�ад�илайте ли�ти на %2$s, щоб друкувати "
-"нові повідомленн�.\n"
+"�ад�илайте ли�ти на %2$s, щоб друкувати нові повідомленн�.\n"
+"\n"
+"Більше інформації про викори�танн� електронної пошти на %3$s.\n"
 "\n"
-"Більше інформації про викори�танн� електронної пошти на %3$s.\n\nЩиро ваші,\n%4$s"
+"Щиро ваші,\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/recoverpassword.php:134
+#: ../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/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:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "URL-адре�а вашого OpenID"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Ваше ім'� кори�тувача на цьому �ервері, "
-"або зареє�трована електронна адре�а."
+"Ваше ім'� кори�тувача на цьому �ервері, або зареє�трована електронна адре�а."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -1967,347 +2709,85 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"[OpenID](%%doc.openid%%) дає вам можливі�ть "
-"реє�трувати�� на багатьох �айтах, "
-"кори�туючи�ь єдиним рахунком. Керувати вашими OpenID можна звід�и."
+"[OpenID](%%doc.openid%%) дає вам можливі�ть реє�трувати�� на багатьох "
+"�айтах, кори�туючи�ь єдиним рахунком. Керувати вашими OpenID можна звід�и."
 
-#: ../lib/util.php:919
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "кілька �екунд тому"
 
-#: ../lib/util.php:931
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "близько %d днів тому"
 
-#: ../lib/util.php:927
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "близько %d годин тому"
 
-#: ../lib/util.php:923
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr "близько %d хвилин тому"
 
-#: ../lib/util.php:935
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr "близько %d мі��ців тому"
 
-#: ../lib/util.php:929
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "день тому"
 
-#: ../lib/util.php:921
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "хвилину тому"
 
-#: ../lib/util.php:933
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "мі��ць тому"
 
-#: ../lib/util.php:937
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "рік тому"
 
-#: ../lib/util.php:925
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "годину тому"
 
-#: ../actions/showstream.php:424 ../lib/stream.php:130
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
 msgid "delete"
 msgstr "видалити"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:408
-#: ../lib/stream.php:114
+#: ../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 "у відповідь на..."
 
-#: ../lib/twitterapi.php:363
-msgid "not a supported data format"
-msgstr "формат даних не підтримуєть��"
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:415
-#: ../lib/stream.php:121
+#: ../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/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
 msgid "same as password above"
 msgstr "такий же, �к пароль вище"
 
-#: ../actions/twitapistatuses.php:691
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:555
 msgid "unsupported file type"
 msgstr "тип файлу не підтримуєть��"
 
-#: ../lib/util.php:1281
+#: ../lib/util.php:1309 lib/util.php:1443
+#, fuzzy
 msgid "« After"
 msgstr "« Вперед"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr ""
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
 #: actions/finishopenidlogin.php:33 actions/imsettings.php:105
@@ -2317,18 +2797,22 @@ msgstr ""
 #: 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:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr ""
 
-#: actions/disfavor.php:63
+#: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr ""
 
-#: actions/disfavor.php:72
+#: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
 msgstr ""
 
@@ -2336,16 +2820,18 @@ msgstr ""
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: actions/emailsettings.php:95
+#: 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: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
+#: classes/Command.php:132 actions/favor.php:86
+#: actions/twitapifavorites.php:125 classes/Command.php:152
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2354,86 +2840,91 @@ msgid "Disfavor"
 msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
 
-#: actions/inbox.php:28
+#: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
 msgstr ""
 
-#: actions/inbox.php:30
+#: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 msgstr ""
 
-#: actions/inbox.php:53
+#: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: actions/invite.php:178
+#: 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/login.php:104
+#: 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:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
 msgstr ""
 
-#: actions/login.php:126
+#: 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 ""
 
-#: actions/newmessage.php:65
+#: 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
+#: 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
+#: 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."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
 msgid "No such user"
 msgstr ""
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "New message"
 msgstr ""
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
 msgstr ""
 
-#: actions/openidsettings.php:28
+#: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 
-#: actions/openidsettings.php:46
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
 msgstr ""
 
@@ -2441,64 +2932,67 @@ msgstr ""
 msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 
-#: actions/openidsettings.php:87
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
 msgstr ""
 
-#: actions/outbox.php:28
+#: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: actions/outbox.php:30
+#: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr ""
 
-#: actions/outbox.php:53
+#: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: actions/peoplesearch.php:28
+#: 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/profilesettings.php:27
+#: 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:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
 msgstr ""
 
-#: actions/recoverpassword.php:141
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: actions/recoverpassword.php:154
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
 msgstr ""
 
-#: actions/recoverpassword.php:169
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
 msgstr ""
 
-#: actions/recoverpassword.php:271
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
 msgstr ""
 
-#: actions/recoverpassword.php:327
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
 msgstr ""
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -2513,21 +3007,22 @@ msgstr ""
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: 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:61 actions/showfavorites.php:145
 #, php-format
 msgid "Feed for favorites of %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 ""
 
-#: actions/showmessage.php:33
+#: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
 msgstr ""
 
@@ -2535,12 +3030,12 @@ msgstr ""
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: actions/showmessage.php:61
+#: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: actions/showmessage.php:66
+#: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
@@ -2549,58 +3044,63 @@ msgstr ""
 msgid "Send a message"
 msgstr ""
 
-#: actions/smssettings.php:312
+#: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
 msgid "Direct Messages You've Sent"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #, 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."
 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/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
 msgid "%s updates favorited by %s / %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 ""
 
 #: 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"
@@ -2612,15 +3112,15 @@ msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
 msgstr ""
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
 msgstr ""
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -2628,7 +3128,7 @@ msgstr ""
 msgid "Twitter Username"
 msgstr ""
 
-#: actions/twittersettings.php:65
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgid "No spaces, please."
 msgstr ""
 
@@ -2636,15 +3136,15 @@ msgstr ""
 msgid "Twitter Password"
 msgstr ""
 
-#: actions/twittersettings.php:72
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: actions/twittersettings.php:75
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: actions/twittersettings.php:78
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
@@ -2654,7 +3154,7 @@ msgid ""
 "underscore (_). 15 chars max."
 msgstr ""
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -2664,160 +3164,166 @@ 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!"
 msgstr ""
 
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
 msgid "Twitter settings saved."
 msgstr ""
 
-#: actions/twittersettings.php:192
+#: 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: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:245 actions/twittersettings.php:461
 msgid "Twitter preferences saved."
 msgstr ""
 
-#: actions/userauthorization.php:84
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
 msgstr ""
 
-#: actions/userauthorization.php:324
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
 msgstr ""
 
-#: actions/userauthorization.php:334
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:204
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:215
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39
+#: classes/Command.php:39 classes/Command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: classes/Command.php:96
+#: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242
+#: 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:146 classes/Command.php:166
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166
+#: classes/Command.php:166 classes/Command.php:189
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: classes/Command.php:169
+#: classes/Command.php:169 classes/Command.php:192
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
-#: classes/Command.php:172
+#: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
-#: classes/Command.php:175
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178
+#: classes/Command.php:178 classes/Command.php:201
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:228
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:300
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:307
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288
+#: 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:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330
+#: 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:313 classes/Command.php:356
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:358
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:379
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:381
 msgid "Can't turn on notification."
 msgstr ""
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53
+#: classes/Message.php:53 classes/Message.php:56
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63
+#: classes/Message.php:63 classes/Message.php:66
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -2825,74 +3331,1627 @@ msgstr ""
 msgid "User without matching profile in system."
 msgstr ""
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:289
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:508
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:512
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43
+#: 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:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
 msgstr ""
 
-#: lib/personal.php:65
+#: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
 msgstr ""
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
 msgstr ""
 
-#: lib/personal.php:75
+#: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
 msgstr ""
 
-#: lib/personal.php:76
+#: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
 msgstr ""
 
-#: lib/personal.php:80
+#: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
 msgstr ""
 
-#: lib/personal.php:81
+#: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
 msgstr ""
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
 msgstr ""
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
 msgstr ""
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgid "To"
 msgstr ""
 
-#: scripts/maildaemon.php:45
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "Could not parse message."
 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."
+msgstr ""
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+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
+#, 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
+#, fuzzy
+msgid "Unknown file type"
+msgstr "тип файлу не підтримуєть��"
+
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#, fuzzy
+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
+#, fuzzy
+msgid "Block user"
+msgstr "Такого кори�тувача немає."
+
+#: actions/block.php:129
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "Ви впевненні, що бажаєте видалити це повідомленн�?"
+
+#: actions/block.php:162
+#, fuzzy
+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
+#, fuzzy
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+"Ви видал�єте повідомленн� назавжди. Якщо ви так зробите, це не матиме "
+"зворотньої дії."
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
+#, 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"
+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
+#, 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"
+msgstr ""
+
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
+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/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "�е вдало�� оновити кори�тувача."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "�алаштуванн� збережено."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Очікуванн� підтвердженн� телефонного номера."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#, fuzzy
+msgid "Make a new email address for posting to; "
+msgstr "�ова електронна адре�а дл� над�иланн� повідомлень на %s"
+
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
+msgstr ""
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+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 ""
+"Код підтвердженн� був відправлений на адре�у IM, �ку ви додали. Ви повинні "
+"�хвалити %s дл� відправленн� вам повідомлень."
+
+#: 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 ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, 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"
+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/facebookinvite.php:70
+#, 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:"
+msgstr ""
+
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
+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:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
+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!"
+msgstr ""
+
+#: actions/facebooksettings.php:67
+#, fuzzy
+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."
+msgstr ""
+
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Профіль"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
+msgstr ""
+
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Переваги"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+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
+#, fuzzy
+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 ""
+
+#: 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/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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "�ватару оновлено."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Оновленн� аватари невдале."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+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. "
+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 "
+msgstr ""
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+#, fuzzy
+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
+#, 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 "�е вдало�� �лідувати за кори�тувачем: кори�тувача не знайдено."
+
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "No such group."
+msgstr "Такого повідомленн� немає."
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Ви не над�илали нам цього профілю"
+
+#: actions/leavegroup.php:100
+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
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: 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
+#, 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 ""
+
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "Повідомленн�"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
+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/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "Вхід OpenID"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Видалити OpenID"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "�алаштуванн�"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "Пошук"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Мова задовга (50 знаків мак�имум)"
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Змінити пароль"
+
+#: actions/passwordsettings.php:89
+#, 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 ""
+
+#: actions/peopletag.php:91
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+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"
+msgstr ""
+
+#: actions/profilesettings.php:144
+#, fuzzy
+msgid "Automatically subscribe to whoever "
+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
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "�евдала підпи�ка."
+
+#: actions/public.php:220
+#, 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 "Живленн� �пільного потоку"
+
+#: actions/publictagcloud.php:63
+#, 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
+#, fuzzy
+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
+#, 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-адре�а вашої домашньої �торінки, блогу, "
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Опишіть �ебе та �вої інтере�и (140 знаків)"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "Де ви живете, на зразок \"City, State (or Region), Country\""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+msgstr ""
+"окрім цих приватних даних: пароль, електронна адре�а, адре�а IM, телефонний "
+"номер."
+
+#: actions/register.php:471
+#, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr ""
+
+#: 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
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Відповіді %s"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
+msgstr ""
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+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"
+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"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Живленн� повідомлень дл� %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, 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 ""
+
+#: actions/showgroup.php:370
+msgid "All members"
+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 "
+msgstr ""
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
+msgstr ""
+
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
+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"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Підпи�чики"
+
+#: actions/showstream.php:533
+msgid "All groups"
+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 "
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "Mobile carrier"
+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 "Підпи�чики"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %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
+#, 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."
+
+#: 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
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+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
+#, fuzzy, php-format
+msgid "Tag %s"
+msgstr "Мітки"
+
+#: actions/tagother.php:141
+#, fuzzy
+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."
+msgstr ""
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+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."
+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."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "�емає знайденого запиту!"
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:126
+#, 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 "�е вдало�� видалити підтвердженн� поштової адре�и."
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Помилка при збереженні кори�тувача."
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "�емає URL-адре�и профілю повернітої �ервером."
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Віддалений профіль без відповідного профілю"
+
+#: actions/unsubscribe.php:71
+#, 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 ""
+
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Проблема при збереженні повідомленн�."
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+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"
+msgstr ""
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328
+#, fuzzy
+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 ""
+
+#: lib/action.php:332
+msgid "Logout from the site"
+msgstr ""
+
+#: lib/action.php:335
+msgid "Login to the site"
+msgstr ""
+
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Створити новий рахунок"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "Такого OpenID немає."
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Допомога"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "�ове повідомленн�"
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "�ове повідомленн�"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Підпи�ки"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+msgid "All "
+msgstr ""
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Такого кори�тувача немає."
+
+#: lib/blockform.php:153
+msgid "Block"
+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/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+#, fuzzy
+msgid "Filter tags"
+msgstr "Живленн� дл� міток %s"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
+
+#: lib/galleryaction.php:137
+#, fuzzy
+msgid "Tag"
+msgstr "Мітки"
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "URL-адре�а вашої домашньої �торінки, блогу, "
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "Підпи�ки"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Опишіть �ебе та �вої інтере�и (140 знаків)"
+
+#: lib/groupeditform.php:158
+#, 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
+msgid "Group"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Вийти"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+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
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Ц� �торінка не до�тупна в медіа-типі, �кий ви приймаєте"
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Увійти"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Зберегти"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "�едій�не ім'� або пароль."
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Створити новий рахунок"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s тепер �лідкує за вашими повідомлен�ми на %2$s."
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Мі�цезнаходженн�"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Домашн� �торінка"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
+
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s тепер �лідкує за вашими повідомлен�ми на %2$s."
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
+msgstr ""
+
+#: lib/messageform.php:110
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Видалити повідомленн�"
+
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "�ове повідомленн�"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 або більше знаків"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "у відповідь на..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "�е можна видалити це повідомленн�."
+
+#: lib/noticelist.php:451
+#, 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 ""
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr ""
+
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr ""
+
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr ""
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Загал"
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#, fuzzy
+msgid "Recent tags"
+msgstr "�едавні мітки"
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "Люди"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Повідомленн�"
+
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "Знайти людей на цьому �айті"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Віддалена підпи�ка"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Віддалена підпи�ка"
+
+#: lib/subgroupnav.php:97
+#, 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 ""
+
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Кори�тувач не має профілю."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Підпи�ку авторизовано"
+
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+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 ""
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "Створити новий рахунок"
+
+#, fuzzy
+#~ msgid "Check if you are sure you want to delete your account."
+#~ msgstr "Ви впевненні, що бажаєте видалити це повідомленн�?"
+
+#, fuzzy
+#~ msgid "Showing recently popular notices"
+#~ msgstr "Знайти змі�т повідомленн�"
+
+#~ msgid " by "
+#~ msgstr "від"
+
+#~ msgid "%1$s Notices recently tagged with %2$s"
+#~ msgstr "%1$s Повідомленн� щойно позначені з %2$s"
+
+#~ msgid "Error inserting notice"
+#~ 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 ""
+#~ "Якщо ви забули, або загубили �вій пароль, ви можете отримати новий на "
+#~ "електронну адре�у, �ку ви закріпили за �воїм рахунком."
+
+#~ msgid "Last message posted: "
+#~ msgstr "О�таннє повідомленн�:"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Тип не підтримуєть��"
+
+#~ msgid "not a supported data format"
+#~ msgstr "формат даних не підтримуєть��"
diff --git a/locale/vi_VN/LC_MESSAGES/laconica.mo b/locale/vi_VN/LC_MESSAGES/laconica.mo
index aecd4454d..730d087e1 100644
--- a/locale/vi_VN/LC_MESSAGES/laconica.mo
+++ b/locale/vi_VN/LC_MESSAGES/laconica.mo
diff --git a/locale/vi_VN/LC_MESSAGES/laconica.po b/locale/vi_VN/LC_MESSAGES/laconica.po
index 3ab63f8c4..c62517cfa 100644
--- a/locale/vi_VN/LC_MESSAGES/laconica.po
+++ b/locale/vi_VN/LC_MESSAGES/laconica.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: laconica\n"
-"Report-Msgid-Bugs-To: mikec@resnet.net.nz\n"
-"POT-Creation-Date: 2008-07-13 17:15+1200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: LienNguyen <lien.nguyen@anhone.vn>\n"
 "Language-Team:  <support@saigonica.com>\n"
@@ -13,24 +13,98 @@ msgstr ""
 "X-Poedit-Language: English\n"
 "X-Poedit-Country: NEW ZEALAND\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../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:193
+#: ../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."
+" except this private data: password, email address, IM address, phone number."
 msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại"
 
-#: ../actions/subscribe.php:84
+#: ../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 ""
+
+#: ../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 dang theo doi tin nhan cua ban tren %2$s."
 
-#: ../actions/subscribe.php:86
+#: ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -44,1064 +118,1846 @@ msgstr ""
 "\n"
 "\t%3$s\n"
 "\n"
-"Ngư�i bạn trung thành của bạn,\n%4$s.\n"
+"Ngư�i bạn trung thành của bạn,\n"
+"%4$s.\n"
 
-#: ../actions/shownotice.php:45
+#: ../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/publicrss.php:60
+#: ../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 Dòng tin công cộng"
 
-#: ../actions/all.php:47
-#: ../actions/allrss.php:70
-#: ../lib/stream.php:45
+#: ../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 và bạn bè"
 
-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33
+#, fuzzy, php-format
+msgid "%s public timeline"
+msgstr "Dòng tin công cộng"
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#, fuzzy, php-format
+msgid "%s status"
+msgstr "Trạng thái của %1$s vào %2$s"
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
+#, fuzzy, php-format
+msgid "%s timeline"
+msgstr "Dòng tin nhắn của %s"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
 #, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
-"**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"(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:235
+#: ../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%%** 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:250
+#: ../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/register.php:176
+#: ../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 "
+"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/register.php:178
+#: ../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/register.php:178
-msgid " Required."
-msgstr " Bắt buộc."
-
-#: ../actions/register.php:178
-msgid "Longer name, preferably your \"real\" name"
-msgstr "H� tên đầy đủ của bạn, tốt nhất là tên thật của bạn."
-
-#: ../actions/recoverpassword.php:165
+#: ../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/imsettings.php:188
+#: ../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
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"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
+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 đến địa chỉ IM. Bạn phải "
-"chấp nhận %s để có thể gửi tin nhắn đến bạn."
+"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."
 
-#: ../lib/util.php:296
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"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/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 "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/twitapilaconica.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:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
 msgid "Accept"
 msgstr "Chấp nhận"
 
-#: ../actions/imsettings.php:64
-#: ../actions/openidsettings.php:57
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/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:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "Thêm OpenID"
 
-#: ../actions/imsettings.php:39
+#: ../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/showstream.php:254
+#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+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/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:422
 msgid "All subscriptions"
 msgstr "Tất cả đăng nhận"
 
-#: ../actions/publicrss.php:62
+#: ../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/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Các thay đổi phù hợp với từ \"%s\""
 
-#: ../actions/finishopenidlogin.php:29
-#: ../actions/login.php:27
-#: ../actions/openidlogin.php:29
-#: ../actions/register.php:28
+#: ../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."
 
-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
 msgstr "�ã đăng nhận rồi!"
 
-#: ../actions/userauthorization.php:76
+#: ../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"
 
-#: ../actions/login.php:100
-#: ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!"
 
-#: ../actions/avatar.php:32
+#: ../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/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/avatar.php:113
+#: ../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/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"�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?)"
+"�ang đợi xác nhận đến địa chỉ này. Hãy kiểm tra tài khoản Jabber/GTalk để "
+"nhận tin nhắn và l�i hướng dẫn. (Bạn đã thêm %s vào danh sách bạn thân chưa?)"
 
-#: ../actions/imsettings.php:55
-#, php-format
+#: ../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 ""
-"�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."
+"�ang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp thư đến (hoặc thư rác) "
+"để nhận tin nhắn và l�i hướng dẫn."
 
-#: ../lib/util.php:1136
-msgid "Before"
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "Awaiting confirmation on this phone number."
+msgstr "�ó không phải là số điện thoại của bạn."
+
+#: ../lib/util.php:1318 lib/util.php:1452
+#, fuzzy
+msgid "Before »"
 msgstr "TrÆ°á»›c"
 
-#: ../actions/profilesettings.php:52
+#: ../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/profilesettings.php:93
-#: ../actions/updateprofile.php:102
+#: ../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/updateprofile.php:118
+#: ../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/updateprofile.php:119 actions/updateprofile.php:120
+#: actions/updateprofile.php:123
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Không thể đ�c URL cho hình đại diện '%s'"
 
-#: ../actions/password.php:85
-#: ../actions/recoverpassword.php:261
+#: ../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/imsettings.php:59
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114
 msgid "Cancel"
 msgstr "Hủy"
 
-#: ../lib/openid.php:121
+#: ../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/imsettings.php:154
+#: ../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/password.php:45
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+#, fuzzy
+msgid "Cannot normalize that email address"
+msgstr "Không thể bình thư�ng hóa địa chỉ GTalk này"
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
 msgid "Change"
 msgstr "Thay đổi"
 
-#: ../actions/password.php:32
+#: ../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/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "�ổi mật khẩu"
 
-#: ../actions/password.php:43
-#: ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+msgid "Change your password"
+msgstr "Thay đổi mật khẩu của bạn"
+
+#: ../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/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/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Xác nhận địa chỉ"
 
-#: ../actions/imsettings.php:213
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: 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/confirmaddress.php:38
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+#, fuzzy
+msgid "Confirmation code"
+msgstr "Không có mã số xác nhận."
+
+#: ../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/finishopenidlogin.php:91
+#: ../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/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "Kết nối"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../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"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Liên hệ"
 
-#: ../lib/openid.php:178
+#: ../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"
 
-#: ../lib/openid.php:160
+#: ../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/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."
+
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Không thể chuyển đến máy chủ: %s"
 
-#: ../actions/updateprofile.php:161
+#: ../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/updateprofile.php:154
+#: ../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/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Không thể xác nhận địa chỉ email."
+#: ../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."
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#, fuzzy
+msgid "Could not subscribe."
+msgstr "Chưa đăng nhận!"
+
+#: ../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/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/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Không thể tạo đăng nhận."
-
-#: ../actions/confirmaddress.php:78
-#: ../actions/imsettings.php:209
+#: ../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/unsubscribe.php:56
+#: ../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/remotesubscribe.php:125
+#: ../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/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/imsettings.php:178
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: 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/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/profilesettings.php:175
+#: ../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/confirmaddress.php:70
-#: ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234
-#: ../actions/profilesettings.php:123
+#: ../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/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:440 actions/emailsettings.php:462
+#, 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:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
 msgid "Create"
 msgstr "Tạo"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../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/finishopenidlogin.php:68
+#: ../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/finishopenidlogin.php:191
+#: ../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/imsettings.php:45
+#: ../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/showstream.php:337
+#: ../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/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/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
 msgstr "Hiện tại"
 
-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, fuzzy, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Lỗi cơ sở dữ liệu khi chèn trả l�i: %s"
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Lỗi cơ sở dữ liệu khi chèn trả l�i: %s"
 
-#: ../actions/profilesettings.php:54
-msgid "Describe your group's interest in 140 characters"
-msgstr "Nói v� những sở thích của nhóm trong vòng 140 ký tự"
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+#: actions/deletenotice.php:79
+msgid "Delete notice"
+msgstr "Xóa tin nhắn"
+
+#: ../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/register.php:181
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
 msgstr "Email"
 
-#: ../actions/profilesettings.php:46
-msgid "Email address"
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
+#, fuzzy
+msgid "Email Address"
 msgstr "�ịa chỉ email"
 
-#: ../actions/profilesettings.php:102
-#: ../actions/register.php:63
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Thiết lập địa chỉ email"
+
+#: ../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."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
 msgstr "Xac nhan dia chi email"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
+#, 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."
 
-#: ../actions/userauthorization.php:136
+#: ../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 "Lỗi cho phép token"
 
-#: ../actions/finishopenidlogin.php:282
+#: ../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/finishaddopenid.php:78
+#: ../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/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/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/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Lỗi xảy ra khi thêm mới tin nhắn"
-
 #: ../actions/finishremotesubscribe.php:167
+#: 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/recoverpassword.php:201
+#: ../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/userauthorization.php:139
+#: ../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/finishopenidlogin.php:222
-#: ../lib/openid.php:226
+#: ../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."
 
-#: ../lib/openid.php:237
+#: ../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/password.php:80
+#: ../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/login.php:43
-#: ../actions/login.php:69
-#: ../actions/recoverpassword.php:268
-#: ../actions/register.php:73
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 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/finishaddopenid.php:83
+#: ../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/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/recoverpassword.php:79
+#: ../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/finishopenidlogin.php:89
+#: ../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"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "FAQ"
 
-msgid "FAQ "
-msgstr "FAQ - H�i đáp"
-
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "Cập nhật hình đại diện không thành công."
 
-#: ../actions/all.php:61
-#: ../actions/allrss.php:74
+#: ../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/replies.php:61
-#: ../actions/repliesrss.php:80
+#: ../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/profilesettings.php:44
+#: ../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"
+
+#: ../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"
+
+#: ../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/login.php:122
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay "
+"đổi trong đi�u chỉnh."
+
+#: ../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:90
-#: ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: 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:279
+#: ../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:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
 msgid "Home"
 msgstr "Trang chủ"
 
-#: ../actions/profilesettings.php:49
+#: ../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/profilesettings.php:87
+#: ../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/imsettings.php:61
+#: ../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."
+
+#: ../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:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "Cấu hình IM"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../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 ""
-"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."
+"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\"."
+"Bạn muốn thêm một OpenId vào tài khoản của bạn, đánh nó vào hộp dưới đây và "
+"nhấn\" Thêm\"."
 
-#: ../actions/recoverpassword.php:122
+#: ../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."
+"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/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
+#, fuzzy
+msgid "Incoming email address removed."
+msgstr "�ịa chỉ email hoặc mật khẩu không đúng."
 
-#: ../actions/password.php:69
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153
 msgid "Incorrect old password"
 msgstr "Mật khẩu cũ sai"
 
-#: ../actions/login.php:63
+#: ../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/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"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."
+"Hướng dẫn cách khôi phục mật khẩu đã được gửi đến địa chỉ email đăng ký "
+"trong tài khoản của bạn."
 
-#: ../actions/updateprofile.php:113
+#: ../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/updateprofile.php:97
+#: ../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/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/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "URL cấp phép '%s'  không hợp lệ"
 
-#: ../actions/postnotice.php:61
+#: ../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/postnotice.php:67
+#: ../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/postnotice.php:72
+#: ../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/updateprofile.php:86
+#: ../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/remotesubscribe.php:96
+#: ../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/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/avatarbynickname.php:37
+#: ../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/finishopenidlogin.php:264
-#: ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: 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ệ."
 
-#: ../lib/util.php:237
-#, php-format
+#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+msgid "Invitation(s) sent"
+msgstr "Thư m�i đã gửi"
+
+#: ../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:"
+
+#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
+#: lib/subgroupnav.php:103
+msgid "Invite"
+msgstr "Thư m�i"
+
+#: ../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"
+
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#, fuzzy, php-format
 msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public License] "
-"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Microblogging [Laconica](http://laconi.ca/), version %s đã có ở [GNU "
-"Affero General Public License] "
-"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Saigonica là bản sửa đổi của phiên bản [Laconica 0.6.0](http://laconi.ca/),  "
+"phát hành theo bản quy�n [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
+#: ../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/imsettings.php:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
-"�ị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."
+"�ịa chỉ Jabber hoặc GTalk, giống như \"UserName@example.org\". �ầu tiên, hãy "
+"tạo thêm %s vào danh sách buddy trên IM client hoặc GTalk của bạn."
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:128
+msgid "Language"
+msgstr "Ngôn ngữ"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:217
+#, fuzzy
+msgid "Language is too long (max 50 chars)."
+msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
 
-#: ../actions/profilesettings.php:55
+#: ../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/profilesettings.php:96
-#: ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: 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/login.php:93
-#: ../actions/login.php:102
-#: ../actions/openidlogin.php:68
-#: ../lib/util.php:286
+#: ../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/openidlogin.php:44
+#: ../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/login.php:112
+#: ../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 ""
-"Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. "
-"Nếu bạn chưa có tài khoản, [hãy đăng ký](%%action.register%%) "
-"tài khoản mới, hoặc thử đăng nhập bằng [OpenID](%%action.openidlogin%%). "
-
-msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account."
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 msgstr ""
-"Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. "
-"Nếu bạn chưa có tài khoản, [hãy đăng ký](%%action.register%%) tài khoản mới."
+"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:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
 msgstr "Thoát"
 
-#: ../actions/login.php:106
+#: ../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/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/showstream.php:281
+#: ../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: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/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog bởi  %s"
 
-#: ../actions/finishopenidlogin.php:79
-#: ../actions/register.php:190
+#: ../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 ""
+"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/finishopenidlogin.php:71
+#: ../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 "Dia chi email moi de gui tin nhan den %s"
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:465
+#, 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"
 
-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
 msgid "New notice"
 msgstr "Thông báo mới"
 
-#: ../actions/password.php:41
-#: ../actions/recoverpassword.php:164
+#: ../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/recoverpassword.php:275
+#: ../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/login.php:97
-#: ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../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/finishopenidlogin.php:175
-#: ../actions/profilesettings.php:99
-#: ../actions/register.php:59
+#: ../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/finishopenidlogin.php:165
-#: ../actions/profilesettings.php:80
-#: ../actions/register.php:57
-#: ../actions/updateprofile.php:76
+#: ../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/finishopenidlogin.php:170
+#: ../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/remotesubscribe.php:72
+#: ../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/recoverpassword.php:147
+#: ../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/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
+msgid "No"
+msgstr "Không"
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
+#: actions/imsettings.php:279
 msgid "No Jabber ID."
 msgstr "Không có Jabber ID."
 
-#: ../actions/userauthorization.php:128
+#: ../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/confirmaddress.php:33
+#: ../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/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/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/newnotice.php:49
+#: ../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/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:304
+#, fuzzy
+msgid "No email address."
+msgstr "�ịa chỉ email của bạn"
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
 msgid "No id."
 msgstr "Không có id."
 
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:430
+#, fuzzy
+msgid "No incoming 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/avatarbynickname.php:27
+#: ../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/imsettings.php:197
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: 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/smssettings.php:176 actions/smssettings.php:184
+#: actions/smssettings.php:294
+#, fuzzy
+msgid "No phone number."
+msgstr "Số điện thoại để nhắn SMS "
+
 #: ../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/recoverpassword.php:189
+#: ../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/userauthorization.php:48
+#: ../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/noticesearch.php:64
-#: ../actions/peoplesearch.php:64
+#: ../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/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "Không có kích thước."
 
-#: ../actions/openidsettings.php:135
+#: ../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/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/openidsettings.php:135 actions/openidsettings.php:144
+#: actions/openidsettings.php:222
 msgid "No such OpenID."
 msgstr "Không có OpenID nào."
 
-#: ../actions/doc.php:29
+#: ../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/shownotice.php:32
-#: ../actions/shownotice.php:65
+#: ../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/recoverpassword.php:56
+#: ../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/postnotice.php:56
+#: ../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:36
-#: ../actions/recoverpassword.php:185
-#: ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91
-#: ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95
-#: ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38
-#: ../actions/userbyid.php:31
-#: ../actions/userrss.php:35
-#: ../actions/xrds.php:31
-#: ../lib/gallery.php:53
+#: ../actions/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."
 
-#: ../lib/gallery.php:76
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+#: actions/recoverpassword.php:251
+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 đó."
+
+#: ../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:60
+#: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr "Mã khôi phục không đúng."
 
-#: ../actions/imsettings.php:158
+#: ../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ý"
+
+#: ../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/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ệ"
 
-#: ../lib/openid.php:131
+#: ../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/profilesettings.php:75
-#: ../actions/register.php:53
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:315
+#, fuzzy
+msgid "Not a valid email address"
+msgstr "�ịa chỉ email không hợp lệ."
+
+#: ../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/profilesettings.php:83
-#: ../actions/register.php:61
+#: ../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/remotesubscribe.php:118
+#: ../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/remotesubscribe.php:111
+#: ../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/remotesubscribe.php:104
+#: ../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à "
+msgstr "Không phải là URL v� hồ sơ cá nhân hợp lệ (không phải là "
 
-#: ../actions/avatar.php:95
+#: ../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/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "Chưa được phép."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "Không mong đợi trả l�i lại!"
 
-#: ../actions/finishaddopenid.php:29
-#: ../actions/logout.php:28
-#: ../actions/newnotice.php:29
-#: ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24
-#: ../lib/settingsaction.php:27
+#: ../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/unsubscribe.php:43
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
 msgstr "Chưa đăng nhận!"
 
-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+#: actions/opensearch.php:67
+#, fuzzy
+msgid "Notice Search"
+msgstr "Tin đã gửi"
+
+#: ../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/shownotice.php:39
+#: ../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/showstream.php:297
+#: ../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/password.php:39
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81 actions/tag.php:41
+#, fuzzy, php-format
+msgid "Notices tagged with %s"
+msgstr "Dòng tin nhắn cho %s"
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
 msgid "Old password"
 msgstr "Mật khẩu cũ"
 
-#: ../lib/util.php:288
+#: ../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: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: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: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: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: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: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:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID lá»—i: %s"
 
-#: ../actions/openidsettings.php:144
+#: ../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:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "Cấu hình OpenID"
 
-#: ../actions/avatar.php:84
+#: ../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/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
 msgid "Partial upload."
 msgstr "Upload từng phần."
 
-#: ../actions/finishopenidlogin.php:90
-#: ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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/recoverpassword.php:249
+#: ../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/recoverpassword.php:245
+#: ../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/recoverpassword.php:222
-#: ../actions/recoverpassword.php:224
+#: ../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"
 
-msgid "Password recovery requested "
-msgstr "Yeu cau khoi phuc lai mat khau da duoc gui"
-
-#: ../actions/password.php:89
-#: ../actions/recoverpassword.php:274
+#: ../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/password.php:61
-#: ../actions/register.php:65
+#: ../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/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Tên tài khoản"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#: actions/opensearch.php:64
+#, fuzzy
+msgid "People Search"
+msgstr "Tìm kiếm nhi�u ngư�i"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Tìm kiếm nhi�u ngư�i"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "Cá nhân"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr "Tin nhắn cá nhân"
+
+#: ../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/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 ""
-"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�\""
+"Vui lòng kiểm tra các chi tiết để chắc chắn rằng bạn muốn đăng nhận xem tin "
+"nhắn của các thành viên này. Nếu bạn không yêu cầu đăng nhận xem tin nhắn "
+"của h�, hãy nhấn \"Hủy b�\""
 
-#: ../actions/imsettings.php:74
+#: ../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/imsettings.php:68
+msgstr "Gửi một tin nhắn khi trạng thái của tôi trên Jabber hay 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 "Tính năng"
 
-#: ../actions/imsettings.php:135
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
 msgstr "Các tính năng đã được lưu."
 
-#: ../lib/util.php:300
+#: ../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ư"
 
-#: ../actions/newnotice.php:61
-#: ../actions/newnotice.php:69
+#: ../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/stream.php:54
+#: ../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: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: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:51
+#: ../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"
 
-#: ../lib/util.php:276
-msgid "Public"
-msgstr "Công cộng"
-
-#: ../actions/public.php:54
+#: ../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/public.php:33
+#: ../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/recoverpassword.php:151
+#: ../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/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/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/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
 msgid "Recover"
 msgstr "Khôi phục"
 
-#: ../actions/recoverpassword.php:141
+#: ../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/recoverpassword.php:67
+#: ../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/register.php:171
-#: ../actions/register.php:195
-#: ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: 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/userauthorization.php:119
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+#, 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"
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
 msgid "Reject"
 msgstr "Từ chối"
 
-#: ../actions/login.php:99
-#: ../actions/register.php:183
+#: ../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/updateprofile.php:69
+#: ../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/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "�ăng nhận từ xa"
 
-#: ../actions/imsettings.php:48
-#: ../actions/openidsettings.php:106
+#: ../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/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "Xóa OpenID"
 
@@ -1110,55 +1966,92 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Việc xóa OpenID của bạn có thể sẽ không đăng nhập được! "
-"Nếu bạn cần xóa nó, hãy tạo một OpenID khác trước đã."
+"Việc xóa OpenID của bạn có thể sẽ không đăng nhập được! Nếu bạn cần xóa nó, "
+"hãy tạo một OpenID khác trước đã."
 
-#: ../lib/stream.php:49
+#: ../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:50
+#: ../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 "Trả l�i cho %s"
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
 msgid "Reset"
 msgstr "Khởi tạo"
 
-#: ../actions/recoverpassword.php:158
+#: ../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/recoverpassword.php:167
-#: ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr "SMS"
+
+#: ../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/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Thiết lập SMS"
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr "Xác nhận SMS"
+
+#: ../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/imsettings.php:76
-#: ../actions/profilesettings.php:58
+#: ../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/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"
 
-#: ../lib/searchaction.php:73
-#: ../lib/util.php:277
+#: ../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/noticesearch.php:80
+#: ../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/noticesearch.php:30
+#: ../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 ""
-"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."
+"Tìm kiếm những tin nhắn trên %%site.name%% bằng nội dung. Chia các cụm từ "
+"cần tìm bởi khoảng trắng; và phải là 3 ký tự trở lên."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1166,170 +2059,298 @@ msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Tìm kiếm những ngư�i trên %%site.name%% bằng tên, vị trí, "
-"hoặc sở thích của h�. Chia các cụm từ bởi khoảng trắng; và phải là 3 ký tự trở lên."
+"Tìm kiếm những ngư�i trên %%site.name%% bằng tên, vị trí, hoặc sở thích của "
+"h�. Chia các cụm từ bởi khoảng trắng; và phải là 3 ký tự trở lên."
 
-#: ../lib/util.php:982
+#: ../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/imsettings.php:71
+#: ../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."
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
+#: actions/imsettings.php:137
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Hãy gửi tin nhắn đến tôi qua Jabber hay GTalk"
 
-#: ../lib/util.php:282
+#: ../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:76 actions/imsettings.php:77
+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:183
+#: ../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/finishaddopenid.php:66
+#: ../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: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."
 
-#: ../lib/util.php:302
+#: ../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:277
+#: ../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:275
+#: ../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:172
-#: ../actions/showstream.php:181
+#: ../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:294
-#: ../actions/subscribers.php:27
+#: ../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/showstream.php:294
-#: ../actions/subscribers.php:27
-msgid "Subscribers "
-msgstr "Theo tôi"
-
-#: ../actions/userauthorization.php:309
+#: ../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:319
+#: ../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:212
-#: ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../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/showstream.php:212
-#: ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
-msgid "Subscriptions "
-msgstr "Tôi theo"
-
-#: ../actions/avatar.php:87
+#: ../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/noticesearch.php:34
+#: ../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: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:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "�ịa chỉ đó đã được xác nhận rồi."
 
-#: ../actions/confirmaddress.php:43
+#: ../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/avatar.php:80
+#: ../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/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:161
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr "Tài khoản đó đã là tên tài khoản Jabber của bạn rồi."
 
-#: ../actions/imsettings.php:224
+#: ../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/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:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr "�ây không phải Jabber ID của bạn."
 
-#: ../actions/imsettings.php:201
+#: ../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/newnotice.php:52
+#: ../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/confirmaddress.php:86
+#: ../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/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "�ịa chỉ \"%s\" đã được xác nhận từ tài khoản của bạn."
 
-#: ../actions/imsettings.php:241
+#: ../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/userauthorization.php:311
+#: ../actions/userauthorization.php:312
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"�ă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à:"
+"�ăng nhận được phép, nhưng URL trả lại không được gởi trả. Hãy kiểm tra các "
+"hướng dẫn chi tiết trên site để biết cách cho phép đăng ký. �ăng nhận token "
+"của bạn là:"
 
-#: ../actions/userauthorization.php:321
+#: ../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 để "
+"�ăng nhận này đã bị từ chối, nhưng không có URL nào để quay v�. Hãy kiểm tra "
+"các hướng dẫn chi tiết trên site để "
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Có nhi�u ngư�i nghe theo l�i nhắn của %s."
 
-#: ../actions/subscribers.php:33
+#: ../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/subscriptions.php:35
+#: ../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/subscriptions.php:33
+#: ../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/recoverpassword.php:87
+#: ../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 ""
+"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."
 
@@ -1338,87 +2359,158 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Trang này sẽ tự động gửi đi. Nếu không, hãy click lên nút "
-"Gửi để gửi đến nhà cung cấp OpenID của bạn."
+"Trang này sẽ tự động gửi đi. Nếu không, hãy click lên nút Gửi để gửi đến nhà "
+"cung cấp OpenID của bạn."
 
-#: ../actions/finishopenidlogin.php:56
+#: ../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 ""
-"�â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."
+"�â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"
 
-#: ../lib/util.php:147
+#: ../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."
+
+#: ../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/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138
+msgid "Timezone"
+msgstr "Khu vá»±c"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr ""
+
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+"�ể đăng ký, bạn cần [�ăng nhập](%%action.login%%), hoặc [�ăng ký](%%action."
+"register%%) tài khoản mới. Nếu bạn đã có một tài khoản khác trên [site "
+"microblogging tương ứng](%%doc.openmublog%%), hãy nhập URL v� hồ sơ cá nhân "
+"của bạn dưới đây."
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:132
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
-"�ể đăng ký, bạn cần [�ăng nhập](%%action.login%%), hoặc "
-"[�ăng ký](%%action.register%%) tài khoản mới. Nếu bạn đã có "
-"một tài khoản khác trên [site microblogging tương "
-"ứng](%%doc.openmublog%%), hãy nhập URL v� hồ sơ cá nhân của bạn dưới đây."
 
-#: ../actions/profilesettings.php:51
+#: ../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 "
+msgstr "URL v� Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
 
-#: ../actions/remotesubscribe.php:74
+#: ../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/imsettings.php:105
-#: ../actions/recoverpassword.php:39
+#: ../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/recoverpassword.php:237
+#: ../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."
 
+#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+msgid "Unknown action"
+msgstr "Không tìm thấy action"
+
 #: ../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."
 
-#: ../lib/util.php:245
+#: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
-"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  "
+"Nếu không có các quy định khác, nội dung của trang web này có bản quy�n của "
+"ngư�i đóng góp và theo bản quy�n  "
 
-#: ../actions/confirmaddress.php:48
+#: ../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/showstream.php:193
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Hết theo"
 
-#: ../actions/postnotice.php:44
-#: ../actions/updateprofile.php:44
+#: ../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/avatar.php:105
+#: ../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/avatar.php:68
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr "Thay đổi bởi SMS"
+
+#: ../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/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:129
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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 "Tải file"
 
@@ -1429,119 +2521,224 @@ msgid ""
 "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 "
+"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 "
+
+#: ../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/profilesettings.php:48
-#: ../actions/register.php:182
+#: ../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 ""
+"�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:43
-#: ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../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:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "Biệt hiệu của ngư�i dùng"
 
-#: ../lib/util.php:969
+#: ../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 ở?"
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
 msgstr "Bạn đang làm gì thế, %s?"
 
-#: ../lib/util.php:969
-#, php-format
-msgid "%s, Tell the world what's on your mind?"
-msgstr "%s, bạn đang làm gì?"
-
-#: ../actions/profilesettings.php:57
-msgid "City, State/Region, Country"
-msgstr "Thành phố, Tỉnh thành, Quốc gia"
+#: ../actions/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/updateprofile.php:127
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Kiểu file ảnh không phù hợp với  '%s'"
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Kích thước file ảnh không phù hợp đối với  '%s'"
 
-#: ../actions/finishaddopenid.php:64
+#: ../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/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/recoverpassword.php:31
+#: ../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/recoverpassword.php:31 actions/recoverpassword.php:31
+#: actions/recoverpassword.php:36
 msgid "You are already logged in!"
 msgstr "Bạn đã đăng nhập!"
 
+#: ../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/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+#, fuzzy
+msgid "You are not friends with the specified 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:164
+#: ../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/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Bạn có thể loại b� OpenID kh�i tài khoản của bạn bằng "
-"cách nhấn vào nút \"Xóa\"."
+"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 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"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."
+"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."
+"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."
+"Bạn có thể cập nhật hồ sơ cá nhân tại đây để m�i ngư�i có thể biết thông tin "
+"v� bạn."
 
-#: ../actions/finishremotesubscribe.php:31
-#: ../actions/remotesubscribe.php:31
+#: ../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/finishopenidlogin.php:33
-#: ../actions/register.php:51
+#: ../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/updateprofile.php:62
+#: ../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/recoverpassword.php:134
+#: ../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 ""
+"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"
+
+#: ../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/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/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 ""
+"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/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
 msgstr "OpenID URL của bạn"
 
-#: ../actions/recoverpassword.php:149
+#: ../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."
 
@@ -1551,1607 +2748,3040 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"[OpenID](%%doc.openid%%) đăng nhập nhi�u website với cùng 1 tài "
-"khoản. Quản lý các OpenID của bạn ở đây."
+"[OpenID](%%doc.openid%%) đăng nhập nhi�u website với cùng 1 tài khoản. Quản "
+"lý các OpenID của bạn ở đây."
 
-#: ../lib/util.php:814
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "vài giây trước"
 
-#: ../lib/util.php:826
+#: ../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"
 
-#: ../lib/util.php:822
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d gi� trước"
 
-#: ../lib/util.php:818
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d phút trước"
 
-#: ../lib/util.php:830
+#: ../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"
 
-#: ../lib/util.php:824
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "1 ngày trước"
 
-#: ../lib/util.php:816
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
 msgstr "1 phút trước"
 
-#: ../lib/util.php:828
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
 msgstr "1 tháng trước"
 
-#: ../lib/util.php:832
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
 msgstr "1 năm trước"
 
-#: ../lib/util.php:820
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "1 gi� trước"
 
-#: ../actions/noticesearch.php:126
-#: ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../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 "còn nữa..."
 
-#: ../actions/noticesearch.php:133
-#: ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "trả l�i"
 
-#: ../actions/password.php:44
+#: ../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"
 
-#: ../lib/util.php:1127
-msgid "After"
-msgstr "Sau"
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:555
+#, fuzzy
+msgid "unsupported file type"
+msgstr "Không hỗ trợ kiểu file ảnh này."
 
-#: ../lib/util.php:
-msgid "Tags"
-msgstr "Từ khóa"
+#: ../lib/util.php:1309 lib/util.php:1443
+#, fuzzy
+msgid "« After"
+msgstr "Sau"
 
-#: ../lib/util.php:
-msgid "Register for a free account!"
-msgstr "�ăng ký tài khoản miễn phí!"
+#: 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."
 
-#: ../lib/util.php:
-msgid "Everyone"
-msgstr "Tất cả m�i ngư�i"
+#: 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!"
 
-#: ../lib/util.php:
-msgid "Welcome to %s"
-msgstr "%s chào mừng bạn "
+#: actions/disfavor.php:63 actions/disfavor.php:87
+#, fuzzy
+msgid "Could not delete favorite."
+msgstr "Không thể tạo favorite."
 
-#: ../lib/util.php:
-msgid "Blog + Chat = Fun"
-msgstr "Vừa Blog vừa Chat = Vui Lắm"
+#: actions/disfavor.php:72 lib/favorform.php:140
+#, fuzzy
+msgid "Favor"
+msgstr "Ưa thích"
 
-#: ../lib/util.php:
-msgid ""
-"%s is a new way to send short messages to your friends, family, and "
-"co-workers."
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
 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."
+"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�."
 
-#: ../lib/util.php:
-msgid ""
-"Starting a conversation is fast and easy: You can shout messages to your "
-"followers, or whisper to your friends. Just think of something to say, and "
-"get started!"
-msgstr ""
-"�ể bắt đầu cuộc đàm luận: Bạn có thể gửi tin nhắn "
-"đến những ngư�i mà bạn theo, hoặc gửi những mong ước "
-"của bạn đến bạn bè, những câu trả l�i thông thư�ng cho một câu h�i đơn giản: Bạn đang làm gì vậy? "
+#: 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/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/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."
 
-#: ../lib/util.php:
-msgid "Register now!"
-msgstr "Hãy đăng ký ngay!"
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr "Không thích"
 
-#: ../lib/util.php:
-msgid "What's the latest?"
-msgstr "M�i ngư�i đang nói gì?"
+#: 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"
 
-#: ../lib/util.php:
-msgid "What Everyone Is Talking About"
-msgstr "M�i ngư�i đang nói gì?"
+#: 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"
 
-#: ../lib/searchaction.php:
-msgid "People"
-msgstr "Tên tài khoản"
+#: 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"
 
-#: ../lib/searchaction.php:
-msgid "Find people on this site"
-msgstr "Tìm kiếm m�i ngư�i trên trang web này"
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr "Hộp thư đến của %s"
 
-#: ../lib/searchaction.php:
-msgid "Text"
-msgstr "Chuỗi bất kỳ"
+#: 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"
 
-#: ../lib/util.php:
-msgid "Find content of notices"
-msgstr "Tìm theo nội dung của tin nhắn"
+#: 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"
 
-#: ../actions/tag.php:
-msgid "Showing most popular tags from the last week"
-msgstr "Các từ khóa phổ biến."
+#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
+#: actions/register.php:416
+#, fuzzy
+msgid "Automatically login in the future; "
+msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!"
 
-#: ../actions/tag.php:
-msgid "Recent Tags"
-msgstr "Các từ khóa hiện tại"
+#: actions/login.php:122 actions/login.php:264
+#, fuzzy
+msgid "For security reasons, please re-enter your "
+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/profileseting.php:
-msgid "What timezone are you normally in?"
-msgstr "Khu vực nào bạn thư�ng ở?"
+#: 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/profileseting.php:
-msgid "Timezone"
-msgstr "Khu vá»±c"
+#: 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/profileseting.php:
-msgid "Language"
-msgstr "Ngôn ngữ"
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."
+msgstr ""
 
-#: ../actions/profileseting.php:
-msgid "Preferred language"
-msgstr "Ngôn ngữ bạn thích"
+#: 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/profileseting.php:
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
 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"
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
 
-#: ../actions/profileseting.php:
-msgid "Could not save profile."
-msgstr "Không thể lưu hồ sơ cá nhân."
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+#, fuzzy
+msgid "No such user"
+msgstr "Không có user nào."
 
-#: ../lib/setingactions.php:
-msgid "Change your profile settings"
-msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn"
+#: actions/newmessage.php:117 actions/newmessage.php:67
+#, fuzzy
+msgid "New message"
+msgstr "Tin mới nhất"
 
-#: ../lib/setingactions.php:
-msgid "Change email handling"
-msgstr "�ang thực hiện việc thay đổi email"
+#: 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"
 
-#: ../lib/setingactions.php:
-msgid "Upload a new profile image"
-msgstr "Tải lên một file ảnh mới cho hồ sơ cá nhân"
+#: actions/openidsettings.php:28 actions/openidsettings.php:70
+#, 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."
 
-#: ../lib/setingactions.php:
-msgid "Change your password"
-msgstr "Thay đổi mật khẩu của bạn"
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+#, 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\"."
 
-#: ../lib/setingactions.php:
-msgid "Add or remove OpenIDs"
-msgstr "Thêm mới hoặc xóa OpenIDs"
+#: 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 đã."
 
-#: ../lib/setingactions.php:
-msgid "Updates by SMS"
-msgstr "Thay đổi bởi SMS"
+#: 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"
+"\"."
 
-#: ../lib/setingactions.php:
-msgid "Updates by instant messenger (IM)"
-msgstr "Thay đổi bởi tin nhắn nhanh (IM)"
+#: 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"
 
-#: ../lib/smsseting.php:
-msgid "SMS Phone number"
-msgstr "Số điện thoại để nhắn SMS "
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr "Hộp thư đi của %s"
 
-#: ../lib/smsseting.php:
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/outbox.php:53 actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
-"Số điện thoại, không cho phép nhập dấu chấm và ký tự "
+"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."
 
-#: ../lib/smsseting.php:
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Bạn có thể nhận tin nhắn SMS qua email từ %%site.name%%."
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+"Tìm kiếm những ngư�i trên %%site.name%% bằng tên, vị trí, hoặc sở thích của "
+"h�. Chia các cụm từ bởi khoảng trắng; và phải là 3 ký tự trở lên."
 
-#: ../lib/smsseting.php:
-msgid "SMS Settings"
-msgstr "Thiết lập SMS"
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
+#, 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."
+
+#: 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 "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
 
-#: ../lib/smsseting.php:
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "SMS xác nhận ngay - đã cho phép gửi qua điện thoại. "
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+#, 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."
 
-#: ../lib/smsseting.php:
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
 msgstr ""
-"Nhà cung cấp dịch vụ điện thoại di động của bạn. Nếu "
-"bạn biết nhà cung cấp dịch vụ điện thoại nào cho phép "
-"nhận SMS qua email  mà chưa có trong danh sách này, vui lòng gửi mail cho chúng tôi đến địa chỉ %s."
 
-#: ../lib/smsseting.php:
-msgid "No code entered"
-msgstr "Không có mã nào được nhập"
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+#, 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."
 
-#: ../lib/smsseting.php:
-msgid "Select a carrier"
-msgstr "Ch�n nhà cung cấp Mobile"
+#: 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."
 
-#: ../lib/smsseting.php:
-msgid "That is not your phone number."
-msgstr "�ó không phải là số điện thoại của bạn."
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+#, fuzzy
+msgid "Instructions for recovering your password "
+msgstr "Sai tên đăng nhập hoặc mật khẩu."
+
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+#, 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�."
+
+#: actions/register.php:95 actions/register.php:180
+#, fuzzy
+msgid "Password must be 6 or more characters."
+msgstr "Mật khẩu phải nhi�u hơn 6 ký tự."
 
-#: ../lib/smsseting.php:
+#: actions/register.php:216
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
 msgstr ""
-"Hãy gửi thông báo đến tôi qua SMS; Tôi  biết là bạn đang "
-"phải trả giá cao cho dịch vụ của chúng tôi. "
 
-#: ../lib/imseting.php:
-msgid "Send me replies through Jabber/GTalk from people I’m not subscribed to."
+#: actions/register.php:227
+#, fuzzy
+msgid "(You should receive a message by email momentarily, with "
 msgstr ""
-"Gửi tin nhắn trả l�i những ngư�i mà tôi không đăng ký qua "
+"(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/imseting.php:
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Gửi MicroID đến địa chỉ Jabber/GTalk của tôi. "
+#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
 
-#: ../lib/emailseting.php:
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Bạn nhận email từ %%site.name%% như thế nào."
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
 
-#: ../lib/emailseting.php:
-msgid "Send me notices of new subscriptions through email."
-msgstr "Hãy gửi email cho tôi thông báo v� các đăng nhận mới."
+#: 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"
 
-#: ../lib/emailseting.php:
-msgid "I want to post notices by email."
-msgstr "Tôi muốn đưa tin nhắn lên bằng email."
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
+msgstr "Không có tin nhắn nào."
 
-#: ../lib/emailseting.php:
-msgid "Publish a MicroID for my email address."
-msgstr "Xuất bản một MicroID đến địa chỉ email của tôi."
+#: actions/showmessage.php:42
+#, 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"
 
-#: ../lib/emailseting.php:
-msgid "Make a new email address for posting to; cancels the old one."
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
-"Tạo một địa chỉ email mới để đưa tin nhắn lên; và xóa "
-
-#: ../lib/emailseting.php:
-msgid "Send email to this address to post new notices."
-msgstr "Gửi email đến địa chỉ này để đưa tin nhắn mới lên."
 
-#: ../actions/choosetheme.php:
-msgid ""
-"You can change the theme as you want by clicking a thumbnail image and then "
-"click Save button to active new theme."
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
-"Bạn có thể thay đổi theme bằng cách ch�n vào một hình ảnh "
-"theme bạn thích. Sau đó nhấn nút Lưu để thay đổi theme mới."
 
-#: ../actions/choosetheme.php:
-msgid "Choose a theme"
-msgstr "Ch�n theme"
+#: actions/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. "
+msgstr ""
 
-#: ../actions/choosetheme.php:
-msgid "Theme Error"
-msgstr "Lá»—i Theme"
+#: 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/choosetheme.php:
-msgid ""
-"Tired of the same old colors on your timeline? Change is good so spice up "
-"your %s page."
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#, php-format
+msgid "All the direct messages sent to %s"
 msgstr ""
-"Nếu cảm thấy nhàm chán với màu sắc cũ trên timeline của "
-"bạn, hãy thay đổi màu sắc để trang %s của bạn hấp dẫn hơn."
 
-#: ../actions/choosetheme.php:
-msgid "Preview"
-msgstr "Xem trÆ°á»›c"
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#, fuzzy
+msgid "Direct Messages You've Sent"
+msgstr "Tin nhắn riêng"
 
-#: ../actions/choosetheme.php:
-msgid "Background Theme:"
-msgstr "Background Theme:"
+#: 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/choosetheme.php:
-msgid "Customize your theme"
-msgstr "Tùy chỉnh theme "
+#: 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/choosetheme.php:
-msgid "Timeline Theme:"
-msgstr "Timeline Theme:"
+#: 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/choosetheme.php:
-msgid "Dashboard Theme:"
-msgstr "Dashboard Theme:"
+#: 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/choosetheme.php:
-msgid "Theme"
-msgstr "Theme"
+#: 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/public.php:
-msgid "Activity"
-msgstr "Các hoạt động"
+#: 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/public.php:
-msgid "Me & My Friends"
-msgstr "Tôi & bạn"
+#: 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/public.php:
-msgid "User & Friends"
-msgstr "Nhóm bạn"
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:165
+#, fuzzy, php-format
+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"
 
-#: ../actions/public.php:
-msgid "My Profile"
-msgstr "Cá nhân"
+#: actions/twittersettings.php:27
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+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/public.php:
-msgid "User Profile"
-msgstr "Hồ sơ"
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+msgid "Twitter settings"
+msgstr "Thiết lập tài khoản Twitter"
 
-#: ../actions/css.php:
-msgid "Customize your page even more with CSS"
-msgstr "Tùy chỉnh trang của bạn bằng CSS"
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
+msgstr "Tài khoản Twitter"
 
-#: ../actions/css.php:
-msgid "Save Changes"
-msgstr "LÆ°u"
+#: 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/css.php:
-msgid "Change css code"
-msgstr "Thay đổi code css"
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr "Tên tài khoản Twitter"
 
-#: ../actions/css.php:
-msgid "You can change your css code here."
-msgstr "Bạn có thể thay đổi code css"
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
+msgstr "Không nhập ký tự trắng."
 
-#: ../actions/css.php:
-msgid "New css code saved."
-msgstr "CSS đã được lưu."
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr "Mật khẩu Twitter"
 
-#: ../lib/util.php:
-msgid "Reply"
-msgstr "Trả l�i"
+#: 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/avatar.php:
-msgid "Upload from your computer"
-msgstr "Tải từ máy tính cá nhân  "
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
 
-#: ../actions/avatar.php:
-msgid "Get from library"
-msgstr "Lấy từ tập ảnh có sẵn"
+#: 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/avatar.php:
-msgid "Male"
-msgstr "Nam"
+#: 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/avatar.php:
-msgid "Female"
-msgstr "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!"
 
-#: ../dasboard.php:
-msgid "Last message"
-msgstr "Tin mới nhất"
+#: 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."
 
-#: ../stream.php:
-msgid "No reply yet"
-msgstr "chưa có trả l�i"
+#: 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!"
 
-msgid "replies"
-msgstr "trả l�i"
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+#, fuzzy
+msgid "Twitter settings saved."
+msgstr "Thiết lập tài khoản Twitter"
 
-#: ../actions/showstream.php:400
-#: ../lib/stream.php:109
-msgid " from "
-msgstr " từ"
+#: 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/invite.php:168
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s moi ban tham gia vao %2$s"
+#: actions/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/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-"%1$s m�i bạn tham gia vào %2$s (%3$s).\n"
-"\n"
-"%2$s là dịch vụ tin nhắn nhanh giúp bạn liên kết với ngư�i "
-"quen và những ngư�i yêu thích bạn.\n"
-"\n"
-"Bạn cũng có thể chia sẻ những suy nghĩ, thông tin v� bạn, "
-"hoặc đ�i sống của bạn lên trên mạng cho những ngư�i quen "
-"của bạn biết. Dịch vụ này cũng giúp bạn gặp gỡ những "
-"ngư�i chưa quen biết nhưng có cùng sở thích.\n"
-"\n"
-"%1$s nói:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Bạn có thể tham khảo trang thông tin cá nhân của  %1$s trên  "
-"%2$s tại đây:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Nếu bạn muốn sử dụng dịch vụ này, hãy nhấn chuột vào "
-"liên kết dưới đây để chấp nhận l�i m�i.\n\n%6$s\n\nNếu không thích tham gia, bạn có thể b� qua tin nhắn này. Rất cảm ơn sự kiên nhẫn vì đã làm mất th�i gian của bạn.\n\nThân, %2$s\n"
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
+msgstr "Tài khoản Twitter đã xóa."
 
-#: ../actions/invite.php:84
-#: ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: 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/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-"Các địa chỉ email của những ngư�i bạn muốn m�i (mỗi "
-"địa chỉ nằm trên 1 dòng)"
+#: actions/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/twitapifriendships.php:60
-#: ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "
+msgstr ""
 
-#: ../actions/recoverpassword.php:102
-msgid "Could not update user with confirmed email address."
-msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
+#, fuzzy
+msgid "The subscription has been authorized, but no "
+msgstr "�ăng nhận được phép"
 
-#: ../actions/twitapistatuses.php:93
-msgid "Couldn't find any statuses."
-msgstr "Không tìm thấy bất kỳ trạng thái nào."
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
+#, fuzzy
+msgid "The subscription has been rejected, but no "
+msgstr "�ăng nhận từ chối"
 
-#: ../actions/invite.php:129
-msgid "Email addresses"
-msgstr "�ịa chỉ email"
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#, fuzzy
+msgid "Command results"
+msgstr "Không có kết quả nào"
 
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr "IM"
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
+msgstr ""
 
-#: ../actions/invite.php:55
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "�ịa chỉ email không đúng:%s"
+#: classes/Channel.php:158 classes/Channel.php:215
+#, fuzzy
+msgid "Command failed"
+msgstr " và bạn bè"
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr "Thư m�i đã gửi"
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
 
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr "Thư m�i đã gửi đến:"
+#: classes/Command.php:96 classes/Command.php:113
+#, fuzzy, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr "Tôi theo"
 
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr "Thư m�i"
+#: 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/invite.php:123
-msgid "Invite new users"
-msgstr "Gửi thư m�i đến những ngư�i chưa có tài khoản"
+#: 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/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+#: classes/Command.php:166 classes/Command.php:189
+#, fuzzy, php-format
+msgid "%1$s (%2$s)"
+msgstr "%s (%s)"
 
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+#: classes/Command.php:169 classes/Command.php:192
+#, fuzzy, php-format
+msgid "Fullname: %s"
+msgstr "Tên đầy đủ"
 
-#: ../actions/recoverpassword.php:211
-msgid "No user with that email address or username."
-msgstr ""
-"Không tìm thấy ngư�i dùng nào tương ứng với địa chỉ "
-"email hoặc username đó."
+#: classes/Command.php:172 classes/Command.php:195
+#, fuzzy, php-format
+msgid "Location: %s"
+msgstr "Thành phố"
 
-#: ../scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr "Không có ngư�i dùng nào đăng ký"
+#: classes/Command.php:175 classes/Command.php:198
+#, fuzzy, php-format
+msgid "Homepage: %s"
+msgstr "Trang chủ hoặc Blog"
 
-#: ../lib/twitterapi.php:226
-#: ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-msgid "Not a supported data format."
-msgstr "Không hỗ trợ định dạng dữ liệu này."
+#: classes/Command.php:178 classes/Command.php:201
+#, fuzzy, php-format
+msgid "About: %s"
+msgstr "Giới thiệu"
 
-#: ../actions/twitapistatuses.php:422
-msgid "Not found"
-msgstr "Không tìm thấy"
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr "Không bắt buộc phải thêm thông điệp vào thư m�i."
+#: classes/Command.php:214 classes/Command.php:245
+#, fuzzy, php-format
+msgid "Direct message to %s sent"
+msgstr "Tin nhắn riêng"
 
-#: ../actions/invite.php:133
-msgid "Personal message"
-msgstr "Tin nhắn cá nhân"
+#: classes/Command.php:216 classes/Command.php:247
+#, fuzzy
+msgid "Error sending direct message."
+msgstr "Thư bạn đã gửi"
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr "SMS"
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr "Xin lỗi, không có địa chỉ email cho phép."
+#: classes/Command.php:270 classes/Command.php:307
+#, fuzzy, php-format
+msgid "Subscribed to %s"
+msgstr "Theo nhóm này"
 
-#: ../scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
 
-#: ../actions/twitapiaccount.php:74
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Tin nhắn quá dài. Chỉ được phép tối đa 255 ký tự."
+#: classes/Command.php:295 classes/Command.php:335
+#, fuzzy, php-format
+msgid "Unsubscribed from %s"
+msgstr "Hết theo"
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
+#: classes/Command.php:376
+msgid "Command not yet implemented."
 msgstr ""
-"Những ngư�i này đã là thành viên rồi và bạn chỉ cần "
-"nhấn nút \"Tôi theo ngư�i này\" để theo h�:"
 
-#: ../actions/twitapifriendships.php:108
-#: ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr "Phương thức này yêu cầu là POST hoặc DELETE"
+#: classes/Command.php:313 classes/Command.php:356
+#, fuzzy
+msgid "Notification off."
+msgstr "Không có mã số xác nhận."
 
-#: ../actions/twitapiaccount.php:65
-#: ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr "Phương thức này yêu cầu là POST."
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
+msgstr ""
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr "Không tìm thấy action"
+#: classes/Command.php:333 classes/Command.php:379
+#, fuzzy
+msgid "Notification on."
+msgstr "Không có mã số xác nhận."
 
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
 msgstr ""
-"�i�n địa chỉ email và nội dung tin nhắn để gửi thư m�i "
-"bạn bè và đồng nghiệp của bạn tham gia vào dịch vụ này."
 
-#: ../actions/twitapiusers.php:75
-msgid "User not found."
-msgstr "Không tìm thấy user."
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
+msgstr ""
 
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr "Bạn đã theo những ngư�i này:"
+#: 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/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr "Bạn đã không xóa trạng thái của những ngư�i khác."
+#: 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."
+
+#: 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/invite.php:31
+#: lib/mail.php:147 lib/mail.php:289
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
 msgstr ""
-"Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
 
-#: ../actions/invite.php:103
+#: 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
+#, php-format
 msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 msgstr ""
-"Bạn sẽ nhận được thông báo khi những ngư�i được bạn "
-"m�i nhận l�i m�i và đăng ký vào trang web này. Cảm ơn bạn "
 
-#: ..lib/personal.php:
+#: 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 ""
+
+#: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
 msgstr "Ưa thích"
 
-#: ..lib/personal.php:
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
 msgid "%s's favorite notices"
 msgstr "Những tin nhắn ưa thích của %s"
 
-#: ..lib/personal.php:
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
 msgstr "Hộp thư đến"
 
-#: ..lib/personal.php:
+#: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
 msgstr "Thư đến của bạn"
 
-#: ..lib/personal.php:
+#: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
 msgstr "Há»™p thÆ° Ä‘i"
 
-#: ..lib/personal.php:
+#: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
 msgstr "Thư bạn đã gửi"
 
-#: ..actions/inbox.php:
-msgid "Inbox for %s - page %d"
-msgstr "Hộp thư đến của %s - trang %d"
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
+#, fuzzy
+msgid "Twitter"
+msgstr "Tài khoản Twitter"
 
-#: ..actions/inbox.php:
-msgid "Inbox for %s"
-msgstr "Hộp thư đến của %s"
+#: 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/inbox.php:
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr "�ây là hộp thư đến của bạn, bao gồm các tin nhắn gửi đến riêng cho bạn"
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
+msgstr ""
 
-#: ..actions/outbox.php:
-msgid "Outbox for %s - page %d"
-msgstr "Hộp thư gửi đi của %s - trang %d"
+#: 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/outbox.php:
-msgid "Outbox for %s"
-msgstr "Hộp thư đi của %s"
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s và bạn bè"
 
-#: ..actions/outbox.php:
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/avatarsettings.php:76
+#, fuzzy
+msgid "You can upload your personal avatar."
 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."
+"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/showfavorites.php:
-msgid "%s favorite notices"
-msgstr "%s ưa thích các tin nhắ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/showfavorites.php:
-msgid "Feed for favorites of %s"
-msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
+msgstr ""
 
-#: ..actions/showfavorites.php:
-msgid "Could not retrieve favorite notices."
-msgstr "Không thể lấy lại các tin nhắn ưa thích"
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
+msgstr "Xem trÆ°á»›c"
 
-#: ..actions/favor.php:
-msgid "There was a problem with your session token. Try again, please."
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#, 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/favor.php:
-msgid "Could not create favorite."
-msgstr "Không thể tạo favorite."
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
 
-#: ..actions/favor.php:
-msgid "Disfavor"
-msgstr "Không thích"
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
+msgstr ""
 
-#: ..actions/favor.php:
-msgid "This notice is already a favorite!"
-msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
+#: actions/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/inbox.php:
-msgid "%s added your notice as a favorite"
-msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
+#: actions/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 "Không hỗ trợ kiểu file ảnh này."
 
-#: ..actions/inbox.php:
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-"In case you forgot, you can see the text of your notice here:\n"
-"\n"
-"%3$s\n"
-"\n"
-"You can see the list of %1$s's favorites here:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Faithfully yours,\n"
-"%5$s\n"
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
-"%1$s vừa thêm tin nhắn của bạn trên %2$s vào danh sách tin "
-"nhắn ưa thích của mình.\n"
-"\n"
-"Bạn có thể xem lại nội dung tin nhắn của bạn tại "
-"đây:\n"
-"\n"
-"%3$s\n"
-"\n"
-"Bạn có thể xem danh sách tin nhắn ưa thích của %1$s tại đây: \n\n%4$s\n\nChúc sức kh�e,\n%5$s\n"
-
-#: ../actions/twitapiaccount.php:49
-#: ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88
-#: ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370
-#: ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr "Phương thức API không tìm thấy!"
 
-#: ../actions/twitapiaccount.php:57
-#: ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119
-#: ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34
-#: ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62
-#: ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47
-#: ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52
-#: ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35
-#: ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr "Phương thức API dưới cấu trúc có sẵn."
+#: actions/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/register.php:176
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 chữ cái thư�ng hoặc là chữ số, không có dấu chấm hay "
-"khoảng trắng. Bắt buộc."
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "Ban user"
 
-#: ../lib/Mailbox.php
-msgid "Direct Messages"
-msgstr "Tin nhắn riêng"
+#: 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?"
 
-#: ../.php
-msgid "Notices sent"
-msgstr "Tin đã gửi"
+#: actions/block.php:162
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Bạn đã theo những ngư�i này:"
 
-#: ../action/deletenotice.php
-msgid "Delete notice"
-msgstr "Xóa tin nhắn"
+#: actions/block.php:167
+msgid "Failed to save block information."
+msgstr ""
 
-#: ../action/deletenotice.php
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
+#: actions/confirmaddress.php:159
+#, fuzzy, php-format
+msgid "The address \"%s\" has been "
+msgstr "�ã xóa địa chỉ."
+
+#: actions/deletenotice.php:73
+#, 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."
 
-#: ../action/deletenotice.php
-msgid "No"
-msgstr "Không"
+#: 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"
 
-#: ../action/deletenotice.php
-msgid "Yes"
-msgstr "Có"
+#: actions/editgroup.php:54
+#, fuzzy, php-format
+msgid "Edit %s group"
+msgstr "%s và nhóm"
 
-#: ../action/deletenotice.php
-msgid "Are you sure you want to delete this notice?"
-msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
+#: 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 ""
 
-#: ..//.php
-msgid "Flagged notices"
-msgstr "Các tin nhắn bị cảnh báo"
+#: 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 "
 
-#: ..//.php
-msgid "flag this notice"
-msgstr "cảnh báo tin nhắn"
+#: 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."
 
-#: ..//.php
-msgid "Flag a notice"
-msgstr "Cảnh báo tin nhắn"
+#: 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."
 
-#: ..//.php
-msgid "Flag this notice?"
-msgstr "Bạn muốn cảnh báo tin nhắn này?"
+#: actions/editgroup.php:106 actions/editgroup.php:165
+#: actions/grouplogo.php:107
+#, 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 "
 
-#: ..//.php
-msgid ""
-"If you think this notice is an offensive message, please notify to the "
-"administrator. Thank you."
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
 msgstr ""
-"Nếu bạn nghĩ tin nhắn này có nội dung xấu không chấp nhận "
-"được, hãy báo cho ban quản trị web site. Cảm ơn rất nhi�u."
 
-#. ./lib/util.php
-msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+#: 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/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "Lý lịch quá dài (không quá 140 ký tự)"
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "Không thể cập nhật thành viên."
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "�ã lưu các đi�u chỉnh."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "�ó không phải là số điện thoại của bạn."
+
+#: 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/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/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
-"Saigonica là bản sửa đổi của phiên bản [Laconica "
-"0.6.0](http://laconi.ca/),  phát hành theo bản quy�n [GNU Affero "
-"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-msgid ""
-"To use this [Saigonica version](%%doc.source%%), you must write the license "
-"is of Laconica and has contributions from Saigonica."
+#: 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/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
 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."
+"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."
 
-#. ./.php
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/facebookhome.php:110
+msgid "Server error - couldn't get user!"
 msgstr ""
-"Gửi email thông báo tôi khi có ai đó lưu tin nhắn của tôi vào "
-"danh sách ưa thích của h�."
 
-#. ./.php
-msgid "Send me email when someone sends me a private message."
-msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
+#: actions/facebookhome.php:196
+#, php-format
+msgid "If you would like the %s app to automatically update "
+msgstr ""
 
-#. ./.php
-msgid "Current verified Twitter account."
-msgstr "Tài khoản Twitter đã được xác nhận."
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, php-format
+msgid "Allow %s to update my Facebook status"
+msgstr ""
 
-#. ./.php
-msgid "Subscribe to my Twitter friends here."
-msgstr "�ăng ký theo những bạn trên Twitter tại đây."
+#: actions/facebookhome.php:218
+msgid "Skip"
+msgstr ""
 
-#. ./.php
-msgid "Twitter Account"
-msgstr "Tài khoản Twitter"
+#: actions/facebookhome.php:235
+#, fuzzy
+msgid "No notice content!"
+msgstr "Không có nội dung!"
 
-#. ./.php
-msgid "Twitter settings"
-msgstr "Thiết lập tài khoản Twitter"
+#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+msgid "Pagination"
+msgstr ""
 
-#. ./.php
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, and "
-"subscribe to Twitter friends already here."
+#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#, fuzzy
+msgid "After"
+msgstr "Sau"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#, fuzzy
+msgid "Before"
+msgstr "TrÆ°á»›c"
+
+#: actions/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
 msgstr ""
-"Hãy đăng ký tài khoản Twitter của bạn để có thể gửi tin "
-"nhắn đến Twitter, bạn cũng có thể  đăng ký theo các bạn của mình trên Twitter tại đây."
 
-#. ./.php
-msgid "No spaces, please."
-msgstr "Không nhập ký tự trắng."
+#: actions/facebookinvite.php:72
+#, fuzzy
+msgid "Invitations have been sent to the following users:"
+msgstr "Thư m�i đã gửi đến:"
 
-#. ./.php
-msgid "Twitter Password"
-msgstr "Mật khẩu Twitter"
+#: 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."
 
-#. ./.php
-msgid "That is not your Twitter account."
-msgstr "Không phải là tài khoản Twitter của bạn."
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "M�i bạn bè"
 
-#. ./.php
-msgid "Couldn't remove Twitter user."
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
+msgstr ""
+
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
 msgstr "Không thể xóa tài khoản Twitter."
 
-#. ./.php
-msgid "Twitter account removed."
-msgstr "Tài khoản Twitter đã xóa."
+#: actions/facebooksettings.php:65
+#, 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."
 
-#. ./.php
-msgid "Couldn't save Twitter preferences."
-msgstr "Không thể lưu các yêu cầu cho tài khoản Twitter. "
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Các tính năng đã được lưu."
 
-#. ./.php
-msgid "Twitter preferences saved."
-msgstr "Các yêu cầu cho tài khoản Twitter đã lưu"
+#: actions/facebooksettings.php:90
+#, fuzzy
+msgid "Automatically update my Facebook status with my notices."
+msgstr "Tự động gửi tin nhắn của tôi đến Twitter."
 
-#. ./.php
-msgid "Twitter Username"
-msgstr "Tên tài khoản Twitter"
+#: actions/facebooksettings.php:97
+#, fuzzy
+msgid "Send \"@\" replies to Facebook."
+msgstr "Hãy gửi tin nhắn đến tôi qua Jabber/GTalk."
 
-#. ./.php
-msgid "Could not verify your Twitter credentials!"
-msgstr "Không thể xác nhận tài khoản Twitter của bạn!"
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Hồ sơ "
 
-#. ./.php
-msgid "Unable to retrieve account information for '%s' from Twitter."
-msgstr "Không thể lấy thông tin tài khoản của '%s' từ Twitter."
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
 
-#. ./.php
-msgid "Unable to save your Twitter settings!"
-msgstr "Không thể lưu thông tin Twitter của bạn!"
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
+msgstr ""
 
-#. ./.php
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_)."
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Tính năng"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Không thích"
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+#, fuzzy
+msgid "Popular notices"
+msgstr "Các tin nhắn bị cảnh bá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/favorited.php:79
+#, fuzzy
+msgid "The most popular notices on the site right now."
+msgstr "Các từ khóa phổ biến."
+
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
 msgstr ""
-"Tên tài khoản phải là các chữ số, chữ cái thư�ng hoặc "
-"viết hoa, hoặc là dấu gạch dưới (_)."
 
-msgid "Automatically send my notices to Twitter."
-msgstr "Tự động gửi tin nhắn của tôi đến Twitter."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr ""
 
-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 ""
-"Gửi những tin nhắn trả l�i của tôi từ những ngư�i mà "
-"tôi không theo qua Jabber/GTalk."
 
-msgid "New email address for posting to %s"
-msgstr "Dia chi email moi de gui tin nhan den %s"
+#: actions/finishremotesubscribe.php:188
+msgid "That user has blocked you from subscribing."
+msgstr ""
 
-msgid "Registration successful"
-msgstr "�ăng ký thành công"
+#: actions/groupbyid.php:79
+msgid "No ID"
+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."
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+#, fuzzy
+msgid "Group logo"
+msgstr "Mã nhóm"
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
 msgstr ""
-"Chúc mừng, %s! Chào mừng bạn đến với  %%%%site.name%%%%. Bây "
-"gi� bạn có thể...\n"
-"\n"
-"* Vào trang [Hồ sơ cá nhân](%s) của bạn và gửi tin nhắn "
-"đầu tiên. \n"
-"* Thêm [địa chỉ Jabber/GTalk](%%%%action.imsettings%%%%) để có "
-"thể gửi tin nhắn nhanh.\n"
-"* [Tìm kiếm ngư�i quen](%%%%action.peoplesearch%%%%) mà bạn nghĩ "
-"là có thể chia sẻ ni�m vui.\n"
-"* ��c xuyên suốt [hướng dẫn](%%%%doc.help%%%%) để hiểu thêm "
-"v� dịch vụ của chúng tôi.\n\nCảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này."
 
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "Hình đại diện đã được cập nhật."
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Cập nhật hình đại diện không thành công."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, fuzzy, php-format
+msgid "%s group members"
+msgstr "Thành viên"
+
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
-"(Bạn sẽ nhận email thông báo, hãy đ�c hướng dẫn để xác "
-"nhận địa chỉ email của bạn.)"
 
-msgid "6 or more characters. Required."
-msgstr "Nhi�u hơn 6 ký tự. Bắt buộc"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr ""
 
-msgid "Same as password above. Required."
-msgstr "Cùng mật khẩu ở trên. Bắt buộc."
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+#, fuzzy
+msgid "Groups"
+msgstr "Nhóm"
 
-msgid "Email Settings"
-msgstr "Thiết lập địa chỉ email"
+#: actions/groups.php:64
+#, fuzzy, php-format
+msgid "Groups, page %d"
+msgstr "Tên nhóm"
 
-msgid "Change theme"
-msgstr "�ổi theme"
+#: actions/groups.php:90
+#, php-format
+msgid "%%%%site.name%%%% groups let you find and talk with "
+msgstr ""
 
-msgid "Customize theme"
-msgstr "Tùy chỉnh theme"
+#: 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
 msgid ""
-"You can change the theme as you want by choosing a thumbnail and then click "
-"Save button to active new theme."
+"Search for groups on %%site.name%% by their name, location, or description. "
 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. "
+"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."
 
-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"
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "Tìm kiếm nhi�u ngư�i"
+
+#: actions/imsettings.php:70
+#, fuzzy
+msgid "You can send and receive notices through "
+msgstr "Bạn đã theo những ngư�i này:"
+
+#: actions/imsettings.php:120
+#, 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."
+
+#: actions/imsettings.php:321
+#, 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:"
+
+#: actions/joingroup.php:128
+#, 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/joingroup.php:135
+#, 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 ""
-"Chào, %1$s .\n"
-"\n"
-"Không biết có phải bạn là ngư�i vừa nhập địa chỉ email "
-"này trên %2$s.\n"
-"\n"
-"Nếu bạn là ngư�i nhập, và bạn muốn xác nhận lại, hãy "
-"nhấn chuột vào đư�ng dẫn dưới đây: \n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Nếu không phải bạn, hãy b� qua tin nhắn này.\n\nCảm ơn bạn đã b� th�i gian để đ�c thư,\n\n%4$s\n\n"
 
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
+#: 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 "
+
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+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/leavegroup.php:100
+#, 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."
+
+#: actions/leavegroup.php:130
+#, 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."
+
+#: actions/leavegroup.php:145
+#, fuzzy, php-format
+msgid "%s left group %s"
+msgstr "%s và nhóm"
+
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
 msgstr ""
-"Bạn có địa chỉ mới để gửi tin nhắn trên %1$s.\n"
-"\n"
-"Hãy gửi email đến %2$s để  có thể nhắn tin.\n"
-"\n"
-"Bạn có thể đ�c hướng dẫn tại %3$s.\n\nChúc sức kh�e,\n%4$s"
 
-msgid "SMS confirmation"
-msgstr "Xác nhận SMS"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr ""
 
-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"
+#: actions/newgroup.php:53
+#, fuzzy
+msgid "New group"
+msgstr "Tạo nhóm"
 
-msgid "New private message from %s"
-msgstr "Bạn có tin nhắn riêng từ %s"
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."
+msgstr ""
+
+#: actions/newgroup.php:177
+#, fuzzy
+msgid "Could not create group."
+msgstr "Không thể tạo favorite."
 
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Không thể tạo đăng nhận."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "File quá lớn."
+
+#: actions/newmessage.php:134
+#, fuzzy
+msgid "Don't send a message to yourself; "
+msgstr "Bạn đã theo những ngư�i này:"
+
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "Tin đã gửi"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+#, fuzzy
+msgid "Ajax Error"
+msgstr "Lá»—i"
+
+#: actions/nudge.php:85
 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"
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"%1$s (%2$s) đã gửi đến bạn tin nhắn riêng:\n"
-"\n"
-"------------------------------------------------------\n"
-"%3$s\n"
-"------------------------------------------------------\n"
-"\n"
-"Bạn có thể trả l�i tại:\n"
-"\n"
-"%4$s\n"
-"\n"
-"�ừng trả l�i lại thư này; sẽ không có ai nhận thư.\n\nChúc sức kh�e,\n%5$s\n"
 
-msgid "Terms of use"
-msgstr "TTSD"
+#: actions/nudge.php:94
+#, fuzzy
+msgid "Nudge sent"
+msgstr "Tin đã gửi"
 
-msgid " Terms of use"
-msgstr "Th�a thuận sử dụng"
+#: actions/nudge.php:97
+#, fuzzy
+msgid "Nudge sent!"
+msgstr "Tin đã gửi"
 
-msgid "Termsofuse"
-msgstr "Th�a thuận sử dụng"
+#: actions/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "�ăng nhập OpenID"
 
-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"
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Xóa OpenID"
 
-msgid "Import from Web Address Book"
-msgstr "Nhập địa chỉ từ Yahoo hoặc Gmail"
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Thiết lập tài khoản Twitter"
 
-msgid "Incorrect email address or password."
-msgstr "�ịa chỉ email hoặc mật khẩu không đúng."
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
 
-msgid "Select All/None"
-msgstr "Ch�n tất cả/Không ch�n"
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr ""
 
-msgid "Contacts not found."
-msgstr "Không tìm thấy kết nối."
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "Tìm kiếm"
 
-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."
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
 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ỉ"
+#: 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ự)."
 
-msgid "Import Contacts Address Book from Yahoo, Gmail"
-msgstr "Nhập sổ địa chỉ liên lạc từ Yahoo, Gmail"
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Thay đổi mật khẩu của bạn"
 
-msgid "Your email address"
-msgstr "�ịa chỉ email của bạn"
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "�ã lưu mật khẩu."
 
-msgid "Import Web Address Book from"
-msgstr "Nhập sổ địa chỉ web từ"
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "�ịa chỉ email không hợp lệ."
 
-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"
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
 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"
+#: actions/peopletag.php:91
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
-"%1$s đã m�i bạn tham gia vào %2$s (%3$s).\n"
-"\n"
-"%1$s đã nói:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Bạn có thể thấy trang hồ sơ của %1$s trên %2$s ở đây:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Nếu bạn muốn thử dịch vụ này, hãy bấm vào đư�ng liên "
-"kết bên dưới để chấp nhận l�i m�i.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Nếu không, bạn có thể b� qua tin nhắn này. Cảm ơn sự kiên nhẫn và th�i gian của bạn dành cho chúng tôi.\n\nXin chân thành cảm ơn, %2$s\n"
 
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "Hồ sơ này không biết"
+
+#: actions/profilesettings.php:124
 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"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 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"
+#: actions/profilesettings.php:144
+#, 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ệ"
 
+#: actions/profilesettings.php:311
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Không thể lưu hồ sơ cá nhân."
+
+#: actions/public.php:107
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Dòng tin công cộng"
+
+#: actions/public.php:173
+#, 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 ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 msgstr ""
-"Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật "
-"khẩu trước khi thay đổi trong đi�u chỉnh."
 
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Dòng tin công cộng"
+
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %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."
 
-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"
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
 msgstr ""
-"Xin chào, %1$s\n"
-"\n"
-"Không biết có phải bạn là ngư�i yêu cầu mật khẩu mới "
-"cho tài khoản này trên %2$s.\n"
-"\n"
-"Nếu chính là bạn và nếu bạn muốn xác nhận, hãy nhấn "
-"chuột vào đư�ng dẫn dưới đây:\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Nếu không phải bạn, hãy b� qua tin nhắn này.\n\nCảm ơn bạn đã b� th�i gian để đ�c thư, \n%1$s\n"
 
-msgid "Create a group"
-msgstr "Tạo nhóm"
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."
+msgstr ""
 
-msgid "No such message."
-msgstr "Không có tin nhắn nào."
+#: 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."
 
-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/register.php:286
+msgid "With this form you can create "
+msgstr ""
 
-msgid "Are you sure you want to delete this message?"
-msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
+#: 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 "
 
-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."
+#: 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"
 
-msgid "Can't delete this message."
-msgstr "Không thể xóa tin nhắn này."
+#: 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 "
 
-msgid "Can't delete this notice."
-msgstr "Không thể xóa tin nhắn này."
+#: actions/register.php:404
+#, 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ự"
+
+#: 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\""
+
+#: 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"
+
+#: actions/register.php:471
+#, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr ""
 
-msgid "%s and group"
+#: actions/register.php:495
+#, 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.)"
+
+#: 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 "Trả l�i cho %s"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s favorite notices, page %d"
+msgstr "%s ưa thích các tin nhắn"
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, fuzzy, php-format
+msgid "%s group"
 msgstr "%s và nhóm"
 
-msgid "My Groups"
-msgstr "Nhóm"
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
 
-msgid "Group Profile"
+#: actions/showgroup.php:206
+#, fuzzy
+msgid "Group profile"
 msgstr "Thông tin nhóm"
 
-msgid "Timeline"
-msgstr "Dòng tin"
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
+msgstr ""
 
-msgid "%s's timeline"
-msgstr "Dòng tin nhắn của %s"
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#, fuzzy
+msgid "Note"
+msgstr "Tin nhắn"
+
+#: actions/showgroup.php:270
+#, fuzzy
+msgid "Group actions"
+msgstr "Mã nhóm"
 
-msgid "Share a thought? Vas-y, ton tour..."
-msgstr "Muốn chia sẽ ý nghĩ của bạn?"
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Dòng tin nhắn cho %s"
 
-msgid "Group Members"
+#: actions/showgroup.php:357 lib/groupnav.php:90
+msgid "Members"
 msgstr "Thành viên"
 
-msgid "Group name"
-msgstr "Tên nhóm"
+#: 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/showgroup.php:370
+#, fuzzy
+msgid "All members"
+msgstr "Thành viên"
+
+#: 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 "
+msgstr ""
+
+#: actions/showmessage.php:98
+#, 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"
+
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid "%s, page %d"
+msgstr "Hộp thư đến của %s - trang %d"
+
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Hồ sơ"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "Hồ sơ"
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+#, fuzzy
+msgid "User actions"
+msgstr "Không tìm thấy action"
+
+#: actions/showstream.php:342
+#, fuzzy
+msgid "Send a direct message to this user"
+msgstr "Bạn đã theo những ngư�i này:"
 
-msgid "Create date"
-msgstr "Ngày thành lập"
+#: actions/showstream.php:343
+#, fuzzy
+msgid "Message"
+msgstr "Tin mới nhất"
 
-msgid "Member count"
-msgstr "Số thành viên"
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "Bạn này theo tôi"
 
+#: actions/showstream.php:533
+#, fuzzy
+msgid "All groups"
+msgstr "Nhóm"
+
+#: actions/showstream.php:542
+#, php-format
 msgid ""
-"By clicking on 'I accept' above, you confirm that you are over 13 years of "
-"age and accept the Terms of Service"
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) 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 ý"
+#: 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ự "
+
+#: 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"
 
-msgid "Group code invalid."
-msgstr "Mã số của nhóm không đúng."
+#: actions/smssettings.php:335
+#, 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 "Register a Group"
-msgstr "�ăng ký nhóm"
+#: actions/smssettings.php:453
+#, fuzzy
+msgid "Mobile carrier"
+msgstr "Ch�n nhà cung cấp Mobile"
 
-msgid "Group code"
-msgstr "Mã nhóm"
+#: 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"
+
+#: actions/subedit.php:83
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Không thể tạo đăng nhận."
+
+#: actions/subscribe.php:55
+#, fuzzy
+msgid "Not a local user."
+msgstr "Không có user nào."
+
+#: actions/subscribe.php:69
+#, fuzzy
+msgid "Subscribed"
+msgstr "Theo bạn này"
+
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Bạn này theo tôi"
+
+#: actions/subscribers.php:52
+#, fuzzy, php-format
+msgid "%s subscribers, page %d"
+msgstr "Theo tôi"
+
+#: actions/subscribers.php:63
+#, fuzzy
+msgid "These are the people who listen to "
+msgstr "Có nhi�u ngư�i nghe theo l�i nhắn của %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."
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Tất cả đăng nhận"
 
-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."
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Tất cả đăng nhận"
 
-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."
+#: actions/subscriptions.php:65
+#, fuzzy
+msgid "These are the people whose notices "
+msgstr "Có nhi�u ngư�i gửi l�i nhắn để  %s nghe theo."
 
-msgid "Manage"
-msgstr "Quản lý"
+#: actions/subscriptions.php:69
+#, 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 "You have no authentication to access this page."
-msgstr "Bạn không có quy�n truy cập trang này."
+#: actions/subscriptions.php:122
+#, fuzzy
+msgid "Jabber"
+msgstr "Không có Jabber ID."
+
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Dòng tin nhắn cho %s"
 
-msgid "Check the flagged notice and then delete or ignore it."
+#: actions/tag.php:66
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
 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"
+#: actions/tagother.php:33
+#, fuzzy
+msgid "Not logged in"
+msgstr "Chưa đăng nhập."
 
-msgid "Description"
-msgstr "Mô tả"
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No id argument."
+msgstr "Không có tài liệu nào."
 
-msgid "Short description of the group"
-msgstr "Mô tả ngắn g�n v� nhóm"
+#: actions/tagother.php:65
+#, fuzzy, php-format
+msgid "Tag %s"
+msgstr "Từ khóa"
 
-msgid "Group"
-msgstr "Nhóm"
+#: actions/tagother.php:141
+#, fuzzy
+msgid "Tag user"
+msgstr "Từ khóa"
 
-msgid "Check notice flagged by user"
-msgstr "Kiểm tra các tin nhắn do ngư�i dùng cảnh báo"
+#: actions/tagother.php:149
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
 
-msgid "is more fun with friends."
-msgstr "vui hơn với bạn bè"
+#: 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."
 
-msgid "Invite your friends"
-msgstr "M�i bạn bè"
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:198
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Không thể lưu hồ sơ cá nhân."
 
-msgid "Hide recommendations"
-msgstr "Tắt"
+#: actions/tagother.php:233
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "Không có tin nhắn nào."
 
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "Microblog bởi  %s"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "Không tìm thấy"
+
+#: actions/twittersettings.php:71
+#, fuzzy
+msgid "Add your Twitter account to automatically send "
+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
+#, fuzzy
+msgid "Twitter user name"
+msgstr "Tên tài khoản Twitter"
+
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Mật khẩu Twitter"
+
+#: actions/twittersettings.php:228
+#, fuzzy
+msgid "Twitter Friends"
+msgstr "Thiết lập tài khoản Twitter"
+
+#: 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 "Không thể lấy thông tin tài khoản của '%s' từ Twitter."
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Lỗi xảy ra khi lưu thành viên."
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Không có URL cho hồ sơ để quay v�."
+
+#: actions/unsubscribe.php:57
+#, 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/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Hết theo"
+
+#: actions/usergroups.php:63
+#, fuzzy, php-format
+msgid "%s groups"
+msgstr "%s và nhóm"
+
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
+msgstr ""
+
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Có lỗi xảy ra khi lưu tin nhắn."
+
+#: classes/Notice.php:109
 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."
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
-"Xin lỗi, bạn cần phải kích hoạt tài khoản của bạn "
-"trước. Chúng tôi đã gửi email tới bạn, vì vậy hãy mở "
-"hộp mail để xem hướng dẫn chi tiết. �ừng quên tìm cả trong spam."
 
-msgid "Current confirmed email address."
-msgstr "�ã xác nhận địa chỉ này."
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr ""
 
-msgid "Chat vs T8M"
-msgstr "Chat và T8M"
+#: 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."
 
-msgid "Prev"
-msgstr "TrÆ°á»›c"
+#: lib/accountsettingsaction.php:119
+#, fuzzy
+msgid "Other"
+msgstr "Sau"
 
-msgid "Next"
-msgstr "Kế"
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr ""
 
-#: ../actions/profilesettings.php:54
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Nói v� bạn và những sở thích của bạn khoảng 140 ký tự"
+#: lib/action.php:130
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
 
-#: ../actions/profilesettings.php:57
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
 
-msgid "Members"
-msgstr "Thành viên"
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
 
-msgid "Subscribe "
-msgstr "Theo nhóm này"
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
 
-msgid "Group View"
-msgstr "Xem theo nhóm"
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
 
-msgid "Linear View"
-msgstr "Xem tuần tự"
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "Giới thiệu"
 
-msgid " and friends"
-msgstr " và bạn bè"
+#: lib/action.php:328
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "Thay đổi mật khẩu của bạn"
 
-msgid "Channels"
-msgstr "Kênh"
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
+msgstr ""
 
-msgid "Channel already exist. Try another one."
-msgstr "Kênh này đã có rồi. Hãy ch�n tên khác."
+#: lib/action.php:332
+msgid "Logout from the site"
+msgstr ""
 
-msgid "Can't save this chanel"
-msgstr "Lỗi khi lưu kênh"
+#: lib/action.php:335
+msgid "Login to the site"
+msgstr ""
 
-msgid "You can create a new channel here."
-msgstr "Bạn có thể tạo kênh tại đây."
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "Tạo tài khoản mới"
 
-msgid "Create Channel"
-msgstr "Tạo Kênh"
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "Không có OpenID nào."
 
-msgid "Channel name"
-msgstr "Tên kênh"
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "Hướng dẫn"
 
-msgid "Name of channel. Required."
-msgstr "Tên kênh. Bắt buộc"
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "Thông báo mới"
 
-msgid "Channel saved successfully"
-msgstr "Tạo kênh thành công."
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
 
-msgid " You have just created channel %s successfuly."
-msgstr "Bạn vừa tạo thành công kênh %s."
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "Thông báo mới"
 
-msgid "Channel"
-msgstr "Kênh"
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Tôi theo"
 
-msgid "No such chanel."
-msgstr "Không tìm thấy kênh nào."
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
 
-msgid "Channels View"
-msgstr "Hệ thống các  kênh"
+#: lib/action.php:630
+msgid "All "
+msgstr ""
 
-msgid "Create a channel"
-msgstr "Tạo kênh"
+#: lib/action.php:635
+msgid "license."
+msgstr ""
 
-msgid "Register user by channel"
-msgstr "�ăng ký theo kênh"
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Ban user"
 
-msgid "The channel this user in"
-msgstr "Kênh mà bạn tham gia"
+#: lib/blockform.php:153
+msgid "Block"
+msgstr ""
 
-msgid " Subscribe"
-msgstr "Theo kênh này"
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "cảnh báo tin nhắn"
 
-msgid "Your incoming and sent messages"
-msgstr "Hộp thư của bạ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"
 
-msgid "Send me all replies through Yahoo Messenger."
-msgstr "Hãy gửi tin nhắn đến tôi qua Yahoo Messenger"
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#, fuzzy
+msgid "Published"
+msgstr "Công cộng"
 
-msgid "Yahoo Messenger Settings"
-msgstr "Thiết lập địa chỉ Yahoo"
+#: 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?"
 
-msgid ""
-"You can send and receive notices through Yahoo Messenger [instant "
-"messages](%%doc.im%%). Configure your yahoo address and settings below."
+#: lib/feedlist.php:64
+msgid "Export data"
 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."
+#: lib/galleryaction.php:121
+msgid "Filter tags"
 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"
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
 
-msgid "Yahoo address, like \"UserName@yahoo.com\""
-msgstr "�ịa chỉ email Yahoo, Ví dụ: \"UserName@yahoo.com\""
+#: lib/galleryaction.php:137
+#, fuzzy
+msgid "Tag"
+msgstr "Từ khóa"
 
-msgid "That yahoo address already belongs to another user."
-msgstr "�ịa chỉ email Yahoo này đã có ngư�i khác sử dụng rồi."
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
 
-msgid "That is already your yahoo address."
-msgstr "Bạn đã dùng địa chỉ email này rồi"
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
 
-msgid "Cannot normalize that Yahoo address"
-msgstr "Không thể bình thư�ng hóa địa chỉ Yahoo này"
+#: lib/groupeditform.php:148
+#, 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 "
 
-msgid "No yahoo address."
-msgstr "Chưa nhập địa chỉ email Yahoo"
+#: lib/groupeditform.php:151
+msgid "Description"
+msgstr "Mô tả"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Nói v� những sở thích của nhóm trong vòng 140 ký tự"
 
+#: lib/groupeditform.php:158
+#, fuzzy
 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."
+"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
+msgid "Group"
+msgstr "Nhóm"
+
+#: lib/groupnav.php:100
+msgid "Admin"
 msgstr ""
-"Mã xác nhận đã được gửi đến địa chỉ email Yahoo của "
-"bạn. Hãy kiểm tra hộp thư đến (và thư rác) và làm theo hướng dẫn trong thư."
 
-msgid "says"
-msgstr "nói"
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
 
-msgid "Your message is posted successful."
-msgstr "Tin nhắn đã gửi đi"
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "Thoá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/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+msgstr ""
 
-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/groupsbymemberssection.php:71
+#, fuzzy
+msgid "Groups with most members"
+msgstr "Thành viên"
 
-msgid "Send me all replies through Jabber/GTalk."
-msgstr "Hãy gửi tin nhắn đến tôi qua Jabber/GTalk."
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr ""
 
-msgid "GTalk Settings"
-msgstr "Thiết lập địa chỉ GTalk"
+#: lib/grouptagcloudsection.php:56
+#, php-format
+msgid "Tags in %s group's notices"
+msgstr ""
 
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+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/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "�ăng nhập"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "LÆ°u"
+
+#: lib/logingroupnav.php:76
+#, 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
+#, 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"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your yahoo address and settings below."
+"Hey, %s.\n"
+"\n"
 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/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s dang theo doi tin nhan cua ban tren %2$s."
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Thành phố"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Trang chủ hoặc Blog"
+
+#: lib/mail.php:258
+#, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your GTalk inbox (and spam "
-"box!) for a message with further instructions."
+"Bio: %s\n"
+"\n"
 msgstr ""
-"�ang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp "
-"thư đến(và thư rác) để nhận tin nhắn và l�i hướng dẫn. "
 
-msgid "GTalk Address"
-msgstr "�ịa chỉ email GTalk"
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
 
-msgid "GTalk address, like \"UserName@gmail.com\""
-msgstr "�ịa chỉ email GTalk, Ví dụ: \"UserName@gmail.com\""
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
 
-msgid "That GTalk address already belongs to another user."
-msgstr "�ịa chỉ email GTalk này đã có ngư�i khác sử dụng rồi."
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
 
-msgid "That is already your GTalk address."
-msgstr "Bạn đã dùng địa chỉ email này rồi"
+#: lib/mailbox.php:229 lib/noticelist.php:380
+#, fuzzy
+msgid "From"
+msgstr " từ"
 
-msgid "Cannot normalize that GTalk address"
-msgstr "Không thể bình thư�ng hóa địa chỉ GTalk này"
+#: lib/messageform.php:110
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Xóa tin nhắn"
 
-msgid "No GTalk address."
-msgstr "Chưa nhập địa chỉ email GTalk"
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "Thông báo mới"
 
-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."
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "Nhi�u hơn 6 ký tự"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "còn nữa..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "cảnh báo tin nhắn"
+
+#: lib/noticelist.php:451
+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"
+msgstr "Tin đã gửi"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Nudge"
+msgstr "Tin đã gửi"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "Bạn đã theo những ngư�i này:"
+
+#: 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)"
 msgstr ""
-"Mã xác nhận đã được gửi đến địa chỉ email GTalk của "
-"bạn. Hãy kiểm tra hộp thư đến (và thư rác) và làm theo hướng dẫn trong thư."
 
-msgid "Check virus"
-msgstr "Kiểm tra virus"
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Công cộng"
 
-msgid "Error"
-msgstr "Lá»—i"
+#: lib/publicgroupnav.php:80
+#, fuzzy
+msgid "User groups"
+msgstr "Hồ sơ"
 
-msgid "Avatar "
-msgstr "Hình"
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#, fuzzy
+msgid "Recent tags"
+msgstr "Các từ khóa hiện tại"
 
-msgid "Avatar settings"
-msgstr "Thay đổi hình đại diện"
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
 
-msgid "No avatar is selected."
-msgstr "Bạn chưa ch�n hình để đưa lên."
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "Tên tài khoản"
 
-msgid "Change your avatar"
-msgstr "Thay đổi hình đại diện của bạn"
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Tin nhắn"
 
-msgid "Updates by Yahoo Messenger (YM)"
-msgstr "Cập nhật địa chỉ Yahoo để gửi tin qua Yahoo Mesenger(YM)"
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "Tìm kiếm m�i ngư�i trên trang web này"
 
-msgid "Twitter integration options"
-msgstr "Các lựa ch�n để tích hợp với Twitter "
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "�ăng nhận từ xa"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Theo nhóm này"
+
+#: lib/subgroupnav.php:97
+#, 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"
+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."
 
-msgid "Ban from network"
-msgstr "Ban user ra kh�i mạng"
+#: lib/subs.php:53
+#, 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
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Theo nhóm này"
 
-msgid "Ban users violate rules of saigonica"
-msgstr "Ban user vi phạm nội quy của saigonica"
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+msgstr "Không"
 
-msgid "Ban user"
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr ""
+
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
 msgstr "Ban user"
 
-msgid "Are you sure to ban this user?"
-msgstr "Bạn có chắc muốn ban ngư�i này không?"
+#: lib/unblockform.php:150
+msgid "Unblock"
+msgstr ""
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+#, fuzzy
+msgid "Unsubscribe from this user"
+msgstr "Hết theo"
+
+#, 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"
+
+#, fuzzy
+#~ msgid "Delete my account confirmation"
+#~ msgstr "Không thể xóa email xác nhận."
+
+#, 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?"
+
+#, 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 [Laconica](http://laconi.ca/) microblogging software, version "
+#~ "%s, available under the [GNU Affero General Public License] (http://www."
+#~ "fsf.org/licensing/licenses/agpl-3.0.html)."
+#~ msgstr ""
+#~ "Microblogging [Laconica](http://laconi.ca/), version %s đã có ở [GNU "
+#~ "Affero General Public License] (http://www.fsf.org/licensing/licenses/"
+#~ "agpl-3.0.html)."
+
+#~ 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 Laconica and has contributions from Saigonica."
+#~ msgstr ""
+#~ "�ể sử dụng [phiên bản Saigonica](%%doc.source%%) này, cần ghi rõ bản "
+#~ "quy�n của Laconia cộng thêm sự đóng góp của Saigonica."
+
+#~ 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 ""
+#~ "A confirmation code was sent to the yahoo email address you added. Check "
+#~ "your inbox (and spam box!) for the code and instructions on how to use it."
+#~ msgstr ""
+#~ "Mã xác nhận đã được gửi đến địa chỉ email Yahoo của bạn. Hãy kiểm tra hộp "
+#~ "thư đến (và thư rác) và làm theo hướng dẫn trong thư."
+
+#~ msgid "says"
+#~ msgstr "nói"
+
+#~ msgid "Your message is posted successful."
+#~ msgstr "Tin nhắn đã gửi đi"
+
+#~ msgid "To use this service, You must register your YM with Saigonica."
+#~ msgstr "�ể được sử dụng dịch vụ này, bạn phải đăng ký YM trên Saigonica"
+
+#~ msgid "To use this service, You must register your Gtalk with Saigonica."
+#~ msgstr "�ể được sử dụng dịch vụ này, bạn phải đăng ký GTalk trên Saigonica"
+
+#~ msgid "GTalk Settings"
+#~ msgstr "Thiết lập địa chỉ GTalk"
+
+#~ msgid ""
+#~ "You can send and receive notices through Jabber/GTalk [instant messages](%"
+#~ "%doc.im%%). Configure your yahoo address and settings below."
+#~ msgstr ""
+#~ "Bạn có thể gửi và nhận những tin nhắn qua Jabber/GTalk [tin nhắn nhanh](%%"
+#~ "doc.im%%). Hãy định dạng địa chỉ của bạn và các thiết lập sau."
+
+#~ msgid ""
+#~ "Awaiting confirmation on this address. Check your GTalk inbox (and spam "
+#~ "box!) for a message with further instructions."
+#~ msgstr ""
+#~ "�ang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp thư đến(và thư rác) "
+#~ "để nhận tin nhắn và l�i hướng dẫn. "
+
+#~ msgid "GTalk Address"
+#~ msgstr "�ịa chỉ email GTalk"
+
+#~ msgid ""
+#~ "A confirmation code was sent to the GTalk email address you added. Check "
+#~ "your inbox (and spam box!) for the code and instructions on how to use it."
+#~ msgstr ""
+#~ "Mã xác nhận đã được gửi đến địa chỉ email GTalk của bạn. Hãy kiểm tra hộp "
+#~ "thư đến (và thư rác) và làm theo hướng dẫn trong thư."
+
+#~ msgid "Check virus"
+#~ msgstr "Kiểm tra virus"
+
+#~ msgid "Avatar "
+#~ msgstr "Hình"
+
+#~ msgid "Change your avatar"
+#~ msgstr "Thay đổi hình đại diện của bạn"
+
+#~ msgid "Updates by Yahoo Messenger (YM)"
+#~ msgstr "Cập nhật địa chỉ Yahoo để gửi tin qua Yahoo Mesenger(YM)"
+
+#~ msgid "Ban from network"
+#~ msgstr "Ban user ra kh�i mạng"
+
+#~ msgid "Ban users violate rules of saigonica"
+#~ msgstr "Ban user vi phạm nội quy của saigonica"
+
+#~ msgid "Are you sure to ban this user?"
+#~ msgstr "Bạn có chắc muốn ban ngư�i này không?"
 
-msgid "Your account was banned."
-msgstr "Tài khoản của bạn đã bị ban."
+#~ msgid "Your account was banned."
+#~ msgstr "Tài khoản của bạn đã bị ban."
 
-msgid "User has been baned."
-msgstr "User đã bị ban."
+#~ msgid "User has been baned."
+#~ msgstr "User đã bị ban."
diff --git a/locale/zh_CN/LC_MESSAGES/laconica.mo b/locale/zh_CN/LC_MESSAGES/laconica.mo
new file mode 100644
index 000000000..cb7ea11ce
--- /dev/null
+++ b/locale/zh_CN/LC_MESSAGES/laconica.mo
diff --git a/locale/zh_CN/LC_MESSAGES/laconica.po b/locale/zh_CN/LC_MESSAGES/laconica.po
index df5b877a8..bf064a138 100644
--- a/locale/zh_CN/LC_MESSAGES/laconica.po
+++ b/locale/zh_CN/LC_MESSAGES/laconica.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: identi.ca\n"
-"Report-Msgid-Bugs-To: gouki@goukihq.org\n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
 "PO-Revision-Date: 2008-12-16 21:31+0800\n"
 "Last-Translator: Yuan Yijun <bbbush.yuan@gmail.com>\n"
 "Language-Team: i18n-zh <i18n-zh@googlegroups.com>\n"
@@ -16,15 +16,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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."
+" except this private data: password, email address, IM address, phone number."
 msgstr "除了��内容：密�，电�邮件，�时通讯��，电���。"
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
@@ -33,11 +34,12 @@ 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: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"
@@ -72,59 +74,8 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
-"%1$s 邀请您加入 %2$s (%3$s)。\n"
-"\n"
-"%2$s "
-"æ"
-"˜"
-"¯"
-"ä"
-"¸"
-"€"
-"ä"
-"¸"
-"ªå¾®å�šå®¢æœ�务，您å�¯ä»¥å�‘朋å�‹æˆ–关注您的人公布信æ�¯ã€‚\n"
-"\n"
-"æ"
-"‚"
-"¨"
-"ä"
-"¹"
-"Ÿ"
-"å"
-"�"
-"¯"
-"ä"
-"»"
-"¥"
-"ä"
-"¸"
-"Ž"
-"ç"
-"º"
-"¿"
-"ä"
-"¸"
-"Š"
-"ç"
-"š"
-"„"
-"æ"
-"œ"
-"‹"
-"å"
-"�"
-"‹"
-"å"
-"…"
-"±"
-"ä"
-"º"
-"«è‡ªå·±çš„新知新闻。您还å�¯ä»¥ä¸Žæœ‰å…±å�Œçˆ±å¥½çš„人交æµ�。\n"
-"\n"
-"%1$s 的�：\n\n%4$s\n\n您�以在这里看到 %1$s 的 %2$s 个人信�：\n\n%5$s\n\n如果您希望�试这个�务，点击下�的链接，接�邀请。\n\n%6$s\n\n如果�希望，�以忽略这�消�。谢谢您的�心和时间。\n\n为您效力的 %2$s\n"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#: ../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 信�。"
@@ -141,25 +92,30 @@ msgid ""
 msgstr ""
 "%1$s 开始关注您的 %2$s 信�。\n"
 "\n"
-"\t%3$s\n\n为您效力的 %4$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 "回� %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/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
+#: 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 公开��"
@@ -167,26 +123,31 @@ 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"
 msgstr "%s �好�"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33
 #, php-format
 msgid "%s public timeline"
 msgstr "%s 公众时间表"
 
-#: ../lib/mail.php:206 lib/mail.php:212
+#: ../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 时间表"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "�自所有人的 %s 消��"
@@ -197,16 +158,16 @@ msgid ""
 "to confirm your email address.)"
 msgstr "(您将收到一�邮件，包�了如何确认邮件地�的说明。)"
 
-#: ../lib/util.php:257 lib/util.php:273
+#: ../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%%). "
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** 是一个微�客�务，�供者为 "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)。"
+"**%%site.name%%** 是一个微�客�务，�供者为 [%%site.broughtby%%](%%site."
+"broughtbyurl%%)。"
 
-#: ../lib/util.php:259 lib/util.php:275
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** 是一个微�客�务。"
@@ -217,6 +178,8 @@ 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 个�写字�或数字，�包�标点�空白"
 
@@ -225,35 +188,42 @@ 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
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr "验��已被��到您新增的�时通讯��。您必须�许 %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 "验��已被��到您新增的电�邮件。请检查收件箱(和垃圾箱)，找到验��并按�求使用它。"
+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 "验��已被��到您新增的电���。请检查收件箱(和垃圾箱)，找到验��并按�求使用它。"
+msgstr ""
+"验��已被��到您新增的电���。请检查收件箱(和垃圾箱)，找到验��并按�求"
+"使用它。"
 
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -265,7 +235,15 @@ msgstr "验è¯�ç �已被å�‘é€�到您新增的电è¯�å�·ç �。请检查收件箱(å’
 #: 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/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 "API 方法未实现�"
 
@@ -283,15 +261,21 @@ msgstr "API 方法未实现�"
 #: 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/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 "API 方法尚未实现。"
 
-#: ../lib/util.php:324 lib/util.php:340
+#: ../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 "接�"
 
@@ -299,38 +283,47 @@ msgstr "接�"
 #: ../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/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: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/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "所有匹��索�件\"%s\"的消�"
@@ -339,18 +332,22 @@ msgstr "所有匹��索�件\"%s\"的消�"
 #: ../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: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 "确认订阅"
 
@@ -361,16 +358,17 @@ msgstr "��这�机器上的登录状�。��在共用的机器上��
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自动订阅任何订阅我的更新的人(这个选项最适�机器人)"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34
+#: 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 "头�已更新。"
 
@@ -380,86 +378,98 @@ 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 "等待确认此地�。请查看您的收件箱(和垃圾箱)是�收到了邮件，其中包�了进一步的指示。"
+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
+#, 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: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/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:121 lib/openid.php:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "无法创建 OpenID 用户对象。"
 
 #: ../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 "无法识别此电�邮件"
 
 #: ../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"
 msgstr "修改电�邮件"
 
 #: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "修改密�"
 
-#: ../lib/settingsaction.php:94
+#: ../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 "修改您的个人信�"
 
@@ -467,24 +477,31 @@ msgstr "修改您的个人信�"
 #: ../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/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
 msgid "Confirmation code"
 msgstr "确认�"
 
 #: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "未找到确认�。"
 
@@ -506,102 +523,68 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"�贺您，%s�欢迎�到 "
-"%%%%site.name%%%%。在这里，您�以：\n"
-"\n"
-"* 转到[个人信�](%s)页�，�表第一�消�。\n"
-"* "
-"æ"
-"·"
-"»"
-"å"
-"Š"
-" "
-"ä"
-"¸"
-"€"
-"ä"
-"¸"
-"ª"
-"["
-"J"
-"a"
-"b"
-"b"
-"e"
-"r"
-"/"
-"G"
-"T"
-"a"
-"l"
-"k"
-"å"
-"¸"
-"�"
-"å"
-"�"
-"·"
-"]"
-"("
-"%"
-"%%%action.imsettings%%%%)，以�通过�时通讯程��布消�。\n* "
-"[�索好�](%%%%action.peoplesearch%%%%)�以�到您过去的好�或与您有共�爱好的人。\n* 更新您的[个人信�](%%%%action.profilesettings%%%%)，添加更多内容。\n* 阅读[在线文档](%%%%doc.help%%%%)，了解更多特性。\n\n感谢您注册��，希望您会喜欢这项�务。"
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: 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/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "�系人"
 
-#: ../lib/openid.php:178 lib/openid.php:178
+#: ../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/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/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
 msgid "Could not follow user: User not found."
 msgstr "无法订阅用户：未找到。"
 
-#: ../lib/openid.php:160 lib/openid.php:160
+#: ../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: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: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:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "无法将请求标记转�为访问令牌。"
 
@@ -609,43 +592,52 @@ msgstr "无法将请求标记转�为访问令牌。"
 #: ../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: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."
 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: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 "无法更新用户记录。"
 
@@ -657,34 +649,46 @@ msgstr "无法更新用户记录。"
 #: 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 "已确认的电�邮件。"
 
@@ -692,164 +696,186 @@ msgstr "已确认的电�邮件。"
 msgid "Currently"
 msgstr "目�"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: ../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
+#: ../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: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: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: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: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:153 actions/finishremotesubscribe.php:166
 msgid "Error inserting avatar"
 msgstr "添加头�出错"
 
 #: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
+#: 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: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: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: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/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: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/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "常�问题FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
 msgstr "更新头�失败。"
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64
+#: 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: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: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 "�索用户信�"
 
@@ -861,50 +887,66 @@ 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/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/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."
@@ -924,18 +966,22 @@ 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 "旧密��正确"
 
-#: ../actions/login.php:67 actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
 msgid "Incorrect username or password."
 msgstr "用户�或密��正确。"
 
@@ -946,89 +992,102 @@ msgid ""
 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:55 actions/invite.php:62 actions/invite.php:70
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "电�邮件地� %s �正确"
 
 #: ../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/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�正确"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "个人信�URL '%s'�正确。"
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135
 msgid "Invalid profile URL (bad format)"
 msgstr "个人信�URL�正确(格�错误)"
 
 #: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
 msgstr "�务器返回的个人信�URL�正确。"
 
 #: ../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: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: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/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:123 actions/invite.php:130 actions/invite.php:104
 msgid "Invite new users"
 msgstr "邀请新用户"
 
-#: ../lib/util.php:261 lib/util.php:277
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, php-format
 msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"它�行[Laconica](http://laconi.ca/)微�客�务，版本 "
-"%s，采用[GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)授�。"
+"它�行[Laconica](http://laconi.ca/)微�客�务，版本 %s，采用[GNU Affero "
+"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
+"授�。"
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: actions/imsettings.php:296
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID 属于�一用户。"
 
@@ -1038,35 +1097,49 @@ 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 加为好�。"
+"Jabber 或 GTalk ��，类似\"UserName@example.org\"。首先，必须在�时�天工具"
+"或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个字符)。"
 
 #: ../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 "使用[OpenID](%%doc.openid%%)��登录。"
@@ -1074,34 +1147,22 @@ msgstr "使用[OpenID](%%doc.openid%%)��登录。"
 #: ../actions/login.php:126
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
-msgstr ""
-"ä"
-"½"
-"¿"
-"ç"
-"”"
-"¨"
-"ç"
-"”"
-"¨"
-"æ"
-"ˆ"
-"·"
-"å"
-"��和密�登录。没有用户�？[注册](%%action.register%%)新��，或者使用[OpenID](%%action.openidlogin%%)。"
-
-#: ../lib/util.php:308 lib/util.php:324
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
+msgstr ""
+
+#: ../lib/util.php:308 lib/util.php: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:110 actions/login.php:110 actions/login.php:245
+#: lib/facebookaction.php:320
 msgid "Lost or forgotten password?"
 msgstr "忘记了密�？"
 
@@ -1111,15 +1172,17 @@ 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%%."
 msgstr "设置 %%site.name%% ��的邮件。"
 
 #: ../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:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
 msgstr "%s 的微�客�务"
@@ -1129,37 +1192,45 @@ msgstr "%s 的微�客�务"
 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 以告知。"
+msgstr ""
+"电�的�务商。如果您的�务商支�通过电�邮件��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: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/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 "新密�"
 
@@ -1170,12 +1241,19 @@ 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 "昵称已被使用，�一个�。"
 
@@ -1183,131 +1261,160 @@ msgstr "昵称已被使用，�一个�。"
 #: ../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/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: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: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/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: 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/twitapistatuses.php:520 actions/twitapifavorites.php:112
+#: actions/twitapistatuses.php:446
 msgid "No status found with that ID."
 msgstr "没有找到此ID的信�。"
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
 msgid "No status with that ID found."
 msgstr "没有找到此ID的信�。"
 
 #: ../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: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: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 "没有这个订阅"
 
@@ -1326,11 +1433,21 @@ msgstr "没有这个订阅"
 #: 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
+#: 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 "没有拥有这个用户�或电�邮件的用户。"
 
@@ -1339,67 +1456,79 @@ 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: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: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: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(没有YADIS数�)。"
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
 msgstr "�是图片文件或文件已��。"
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "未认�。"
 
 #: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
 msgstr "未预料的�应�"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:309
 msgid "Not found"
 msgstr "未找到"
 
@@ -1410,144 +1539,175 @@ msgstr "未找到"
 #: 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
+#: 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: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: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 "旧密�"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330
+#: 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: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: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:135 actions/invite.php:143 actions/invite.php:180
 msgid "Optionally add a personal message to the invitation."
 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/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/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/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/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"
 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/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:133 actions/invite.php:141 actions/invite.php:178
 msgid "Personal message"
 msgstr "个人消�"
 
@@ -1560,69 +1720,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 "请检查详细信�，确认希望订阅此用户的通告。如果您刚�没有�求订阅任何人的通告，请点击\"�消\"。"
+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/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"
 msgstr "首选语言"
 
-#: ../lib/util.php:328 lib/util.php:344
+#: ../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: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/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/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:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "公开的��"
 
-#: ../actions/public.php:33 actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 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:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
 msgid "Publish a MicroID for my email address."
 msgstr "公开电�邮件的 MicroID。"
 
@@ -1632,44 +1807,55 @@ 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/register.php:200 actions/register.php:214
+#: actions/register.php:67
 msgid "Registration successful"
 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/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414
 msgid "Remember me"
 msgstr "记�登录状�"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
 msgstr "没有匹�的远程个人信�"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
 msgstr "远程订阅"
 
@@ -1679,11 +1865,15 @@ msgstr "远程订阅"
 #: 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/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/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "移除OpenID"
 
@@ -1693,45 +1883,54 @@ msgid ""
 "remove it, add another OpenID first."
 msgstr "移除唯一的OpenID�能使您无法登陆�如果需�移除它，请先添加一个新的。"
 
-#: ../lib/stream.php:55 lib/personal.php:55
+#: ../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短信"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: 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: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 "相�的密�。此项必填。"
 
@@ -1739,52 +1938,68 @@ msgstr "相�的密�。此项必填。"
 #: ../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/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/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 "�索��"
 
 #: ../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 个字符，多个�索�件用空格分隔。"
+msgstr ""
+"在 %%site.name%% 的通告内容中�索。�索�件至少包� 3 个字符，多个�索�件用"
+"空格分隔。"
 
 #: ../actions/peoplesearch.php:28
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
-msgstr "在 %%site.name%% 的用户信�中�索，�以�索姓��未知和爱好。�索�件至少包� 3 个字符，多个�索�件用空格分隔。"
+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
+#: 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��通告。"
 
@@ -1798,11 +2013,12 @@ msgstr "通过SMS短信将通告�给我；我了解这样也许会给我带�
 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/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 "设置已�存。"
 
@@ -1811,66 +2027,83 @@ 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/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
+#: 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 "标签"
 
@@ -1879,18 +2112,22 @@ 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/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
 msgstr "此确认��适用�"
 
@@ -1899,52 +2136,64 @@ 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/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
 msgstr "您已登记此Jabber��。"
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
 msgid "That is already your email address."
 msgstr "您已登记此电�邮件。"
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
 msgid "That is already your phone number."
 msgstr "您已登记此电���。"
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
 msgstr "这�是您的Jabber��。"
 
 #: ../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 "�时通讯��错误。"
 
 #: ../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 个字符。"
 
@@ -1956,6 +2205,8 @@ 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 "地�被移除。"
 
@@ -1964,7 +2215,8 @@ 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。请到此网站查看如何确认订阅。您的订阅标识是："
+msgstr ""
+"订阅已确认，但是没有回传URL。请到此网站查看如何确认订阅。您的订阅标识是："
 
 #: ../actions/userauthorization.php:322
 msgid ""
@@ -1991,10 +2243,9 @@ msgstr "这是 %s 订阅的用户。"
 msgid "These are the people whose notices you listen to."
 msgstr "这是您订阅的用户。"
 
-#: ../actions/invite.php:89 actions/invite.php:96
+#: ../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:"
+"These people are already users and you were automatically subscribed to them:"
 msgstr "这些好�已注册，您已自动订阅这些用户。"
 
 #: ../actions/recoverpassword.php:88
@@ -2008,23 +2259,29 @@ msgid ""
 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 连接到这里的��。您�以创建新��，或者连接到已有的��。"
+msgstr ""
+"这是您第一次登陆 %s，我们需�将 OpenID 连接到这里的��。您�以创建新��，或"
+"者连接到已有的��。"
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
+#: 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/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请求。"
 
@@ -2033,70 +2290,36 @@ 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/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
-msgstr ""
-"è"
-"¯"
-"·"
-"["
-"ç"
-"™"
-"»"
-"å"
-"½"
-"•"
-"]"
-"("
-"%"
-"%"
-"a"
-"c"
-"t"
-"i"
-"o"
-"n"
-"."
-"l"
-"o"
-"g"
-"i"
-"n"
-"%"
-"%"
-")"
-"æ"
-"ˆ"
-"–"
-"["
-"æ"
-"³"
-"¨"
-"å"
-"†Œ](%%action.register%%)å¸�å�·ä»¥è®¢é˜…。如果您已ç»�有了[兼容的微å�šå®¢ç«™ç‚¹](%%doc.openmublog%%)çš„å¸�å�·ï¼Œè¯·è¾“入个人信æ�¯URL。"
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: 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"
 
@@ -2104,20 +2327,24 @@ msgstr "您在其他兼容的微�客�务的个人信�URL"
 #: ../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/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
+#: ../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:60 actions/finishremotesubscribe.php:61
 msgid "Unknown version of OMB protocol."
 msgstr "此OMB�议版本无效。"
 
@@ -2128,42 +2355,51 @@ msgid ""
 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/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 "�支�这�图�格�。"
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
 msgid "Updates by SMS"
 msgstr "使用SMS短信更新"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
 msgid "Updates by instant messenger (IM)"
 msgstr "使用�时通讯工具(IM)更新"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:129
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$s 上 %1$s 和好�的更新�"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
 #, php-format
 msgid "Updates from %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 "上传"
 
@@ -2173,16 +2409,17 @@ msgid ""
 "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 "在这里上传新的头�。上传�无法修改，请尽�使用正方形图片。图片必须使用与站点相�的授�。请使用您希望分享的属于您的图片。"
+msgstr ""
+"在这里上传新的头�。上传�无法修改，请尽�使用正方形图片。图片必须使用与站点"
+"相�的授�。请使用您希望分享的属于您的图片。"
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
 msgstr "上传个人信�头�"
 
-#: ../actions/invite.php:114 actions/invite.php:121
+#: ../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."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr "使用这个表��邀请好�和�事加入。"
 
 #: ../actions/register.php:159 ../actions/register.php:162
@@ -2191,7 +2428,7 @@ msgid "Used only for updates, announcements, and password recovery"
 msgstr "�用于更新�通告或密���"
 
 #: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
 msgid "User being listened to doesn't exist."
 msgstr "�查看的用户�存在。"
 
@@ -2205,10 +2442,16 @@ msgstr "�查看的用户�存在。"
 #: 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/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
 msgid "User nickname"
 msgstr "昵称"
 
@@ -2217,35 +2460,42 @@ msgid "User not found."
 msgstr "未找到用户。"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
 msgid "What timezone are you normally in?"
 msgstr "您一般处于哪个时区？"
 
-#: ../lib/util.php:1159 lib/util.php:1293
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, 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 "你的�置，格�类似\"城市，�份，国家\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "'%s' 图�格�错误"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "图�大� '%s' 错误"
 
 #: ../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�"
 
@@ -2256,14 +2506,16 @@ msgid ""
 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:81 actions/invite.php:88 actions/invite.php:120
 msgid "You are already subscribed to these users:"
 msgstr "您已订阅这些用户："
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
 msgid "You are not friends with the specified user."
 msgstr "您与此用户并�好�。"
 
@@ -2276,6 +2528,7 @@ msgid "You can create a new account to start posting notices."
 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短信。"
@@ -2289,27 +2542,32 @@ 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%%)��和接�通告。在这里�置它们。"
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"您�以通过Jabber/GTalk [�时通讯工具](%%doc.im%%)��和接�通告。在这里�置它"
+"们。"
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"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/updateprofile.php:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67
 msgid "You did not send us that profile"
 msgstr "您未告知此个人信�"
 
@@ -2327,18 +2585,23 @@ msgid ""
 msgstr ""
 "您的 %1$s �布用地�已更新。\n"
 "\n"
-"��邮件到 %2$s ��布新消�。\n\n更多电�邮件的帮助请� %3$s。\n\n为您效力的 %4$s"
+"��邮件到 %2$s ��布新消�。\n"
+"\n"
+"更多电�邮件的帮助请� %3$s。\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: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: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!"
@@ -2349,6 +2612,7 @@ 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"
 
@@ -2361,49 +2625,51 @@ msgstr "您在此�务器的昵称，或注册邮箱。"
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
-msgstr "[OpenID](%%doc.openid%%)�许您使用相�的��登录许多��的站点。在这里管�已关�的 OpenID。"
+msgstr ""
+"[OpenID](%%doc.openid%%)�许您使用相�的��登录许多��的站点。在这里管�已"
+"关�的 OpenID。"
 
-#: ../lib/util.php:943 lib/util.php:992
+#: ../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: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: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: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: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: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: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: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: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:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
 msgstr "一�时�"
 
@@ -2414,25 +2680,28 @@ 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/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/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 "« 之�"
 
@@ -2445,18 +2714,22 @@ msgstr "« 之�"
 #: 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:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr "此通告未被收��"
 
-#: actions/disfavor.php:63
+#: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "无法删除收�。"
 
-#: actions/disfavor.php:72
+#: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
 msgstr "收�"
 
@@ -2464,16 +2737,18 @@ msgstr "收�"
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "如果有人收�我的通告，�邮件通知我。"
 
-#: actions/emailsettings.php:95
+#: 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: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
+#: classes/Command.php:132 actions/favor.php:86
+#: actions/twitapifavorites.php:125 classes/Command.php:152
 msgid "Could not create favorite."
 msgstr "无法创建收�。"
 
@@ -2482,86 +2757,93 @@ msgid "Disfavor"
 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/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "%s 的收�的��"
 
-#: actions/inbox.php:28
+#: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
 msgstr "%s 的收件箱 - 第 %d 页"
 
-#: actions/inbox.php:30
+#: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 msgstr "%s 的收件箱"
 
-#: actions/inbox.php:53
+#: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "这是您的收件箱，包��给您的�人消�。"
 
-#: actions/invite.php:178
+#: 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"
+msgstr ""
+"%1$s 邀请您加入 %2$s (%3$s)。\n"
+"\n"
 
-#: actions/login.php:104
+#: 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:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
 msgstr "由于安全原因，请�新输入"
 
-#: actions/login.php:126
+#: 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:65 actions/newmessage.php:128
 msgid "No recipient specified."
 msgstr "没有收件人。"
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: 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
+#: 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."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "���自己��消�；跟自己悄悄说就得了。"
 
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
 msgid "No such user"
 msgstr "未找到用户"
 
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "New message"
 msgstr "新消�"
 
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
 msgstr "找�到匹�的通告"
 
-#: actions/openidsettings.php:28
+#: 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/openidsettings.php:46
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
 msgstr "如果您希望添加OpenID，"
 
@@ -2569,64 +2851,67 @@ msgstr "如果您希望添加OpenID，"
 msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr "移除仅有的OpenID�能使您无法登陆�"
 
-#: actions/openidsettings.php:87
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
 msgstr "您�以移除一个OpenID"
 
-#: actions/outbox.php:28
+#: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr "%s 的�件箱 - 第 %d 页"
 
-#: actions/outbox.php:30
+#: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s 的�件箱"
 
-#: actions/outbox.php:53
+#: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "这是您的�件箱，包�您��的�人消�。"
 
-#: actions/peoplesearch.php:28
+#: 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/profilesettings.php:27
+#: 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:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
 msgstr "验��超时。"
 
-#: actions/recoverpassword.php:141
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
 msgstr "如果您忘记或丢失了您的"
 
-#: actions/recoverpassword.php:154
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
 msgstr "您已得到确认。输入"
 
-#: actions/recoverpassword.php:169
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
 msgstr "您在�务器上的昵称，"
 
-#: actions/recoverpassword.php:271
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
 msgstr "��密�的步骤"
 
-#: actions/recoverpassword.php:327
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
 msgstr "新密�已�存。"
 
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
 msgstr "密�必须包� 6 个或更多字符。"
 
@@ -2641,21 +2926,22 @@ msgstr "ç¥�贺你，%sï¼�欢迎æ�¥åˆ° %%%%site.name%%%%。在这里，您å�¯ä»¥â
 msgid "(You should receive a message by email momentarily, with "
 msgstr "(您将立�收到一�电�邮件，�有"
 
-#: actions/remotesubscribe.php:51
+#: 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: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:33 actions/showmessage.php:81
 msgid "No such message."
 msgstr "未找到此消�。"
 
@@ -2663,12 +2949,12 @@ msgstr "未找到此消�。"
 msgid "Only the sender and recipient may read this message."
 msgstr "�有��和接��方�以阅读此消�。"
 
-#: actions/showmessage.php:61
+#: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "��给 %1$s 的 %2$s 消�"
 
-#: actions/showmessage.php:66
+#: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "�自 %1$s 的 %2$s 消�"
@@ -2677,78 +2963,85 @@ msgstr "�自 %1$s 的 %2$s 消�"
 msgid "Send a message"
 msgstr "��消�"
 
-#: actions/smssettings.php:312
+#: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
 msgstr "手机的��商。"
 
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #, php-format
 msgid "Direct messages to %s"
 msgstr "�给 %s 的直接消�"
 
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "�给 %s 的直接消�"
 
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
 msgid "Direct Messages You've Sent"
 msgstr "您已��的直接消�"
 
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #, 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."
 msgstr "无法�并�好�的用户��直接消�。"
 
-#: actions/twitapifavorites.php:92
+#: 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: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/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 收�了您的 %2$s 通告。\n\n"
+msgstr ""
+"%1$s 收�了您的 %2$s 通告。\n"
+"\n"
 
 #: actions/twittersettings.php:27
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr "添加 Twitter ��，自动� Twitter ��更新。"
 
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
 msgstr "Twitter 设置"
 
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
 msgstr "Twitter ��"
 
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
 msgstr "已验�的 Twitter ��。"
 
@@ -2756,7 +3049,7 @@ msgstr "已验�的 Twitter ��。"
 msgid "Twitter Username"
 msgstr "Twitter 用户�"
 
-#: actions/twittersettings.php:65
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgid "No spaces, please."
 msgstr "请��包�空格。"
 
@@ -2764,15 +3057,15 @@ msgstr "请��包�空格。"
 msgid "Twitter Password"
 msgstr "Twitter 密�"
 
-#: actions/twittersettings.php:72
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
 msgstr "自动将我的通告转�到 Twitter。"
 
-#: actions/twittersettings.php:75
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Send local \"@\" replies to Twitter."
 msgstr "将这里的 \"@\" 回���到 Twitter。"
 
-#: actions/twittersettings.php:78
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Subscribe to my Twitter friends here."
 msgstr "在这里订阅 Twitter 好�。"
 
@@ -2782,7 +3075,7 @@ msgid ""
 "underscore (_). 15 chars max."
 msgstr "用户��能包�数字，大写和�写字�和下划线。�能超过 15 个字符。"
 
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
 msgid "Could not verify your Twitter credentials!"
 msgstr "�能验� Twitter ���"
 
@@ -2792,160 +3085,166 @@ 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:174 actions/twittersettings.php:376
 msgid "Twitter settings saved."
 msgstr "Twitter 设置已�存。"
 
-#: actions/twittersettings.php:192
+#: 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: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:245 actions/twittersettings.php:461
 msgid "Twitter preferences saved."
 msgstr "Twitter 首选项已�存。"
 
-#: actions/userauthorization.php:84
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
 msgstr "请检查详细信�"
 
-#: actions/userauthorization.php:324
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
 msgstr "订阅已确认，但是"
 
-#: actions/userauthorization.php:334
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
 msgstr "订阅已拒�，但是"
 
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
 msgid "Command results"
 msgstr "执行结果"
 
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:204
 msgid "Command complete"
 msgstr "执行完毕"
 
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:215
 msgid "Command failed"
 msgstr "执行失败"
 
-#: classes/Command.php:39
+#: classes/Command.php:39 classes/Command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "对�起，这个命令还没有实现。"
 
-#: classes/Command.php:96
+#: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
 msgstr "订阅：%1$s\n"
 
-#: classes/Command.php:125 classes/Command.php:242
+#: 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:146 classes/Command.php:166
 msgid "Notice marked as fave."
 msgstr "通告被标记为收�。"
 
-#: classes/Command.php:166
+#: classes/Command.php:166 classes/Command.php:189
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169
+#: classes/Command.php:169 classes/Command.php:192
 #, php-format
 msgid "Fullname: %s"
 msgstr "全�：%s"
 
-#: classes/Command.php:172
+#: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
 msgstr "�置：%s"
 
-#: classes/Command.php:175
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
 msgid "Homepage: %s"
 msgstr "主页：%s"
 
-#: classes/Command.php:178
+#: classes/Command.php:178 classes/Command.php:201
 #, php-format
 msgid "About: %s"
 msgstr "关于：%s"
 
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:228
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "您的消�包� %d 个字符，超出长度�制 - �能超过 140 个字符。"
 
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "已� %s ��消�"
 
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
 msgstr "��消�出错。"
 
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:300
 msgid "Specify the name of the user to subscribe to"
 msgstr "指定�订阅的用户�"
 
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:307
 #, php-format
 msgid "Subscribed to %s"
 msgstr "订阅 %s"
 
-#: classes/Command.php:288
+#: 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:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "�消订阅 %s"
 
-#: classes/Command.php:310 classes/Command.php:330
+#: 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:313 classes/Command.php:356
 msgid "Notification off."
 msgstr "通告关闭。"
 
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:358
 msgid "Can't turn off notification."
 msgstr "无法关闭通告。"
 
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:379
 msgid "Notification on."
 msgstr "通告开�。"
 
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:381
 msgid "Can't turn on notification."
 msgstr "无法开�通告。"
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
 msgstr "命令：\n"
 
-#: classes/Message.php:53
+#: classes/Message.php:53 classes/Message.php:56
 msgid "Could not insert message."
 msgstr "无法添加信�。"
 
-#: classes/Message.php:63
+#: classes/Message.php:63 classes/Message.php:66
 msgid "Could not update message with new URI."
 msgstr "无法添加新URI的信�。"
 
@@ -2953,74 +3252,1637 @@ msgstr "无法添加新URI的信�。"
 msgid "User without matching profile in system."
 msgstr "系统中没有相应用户的信�。"
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:289
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
-msgstr "您的新的�布用的地�是 %1$s。\n\n"
+msgstr ""
+"您的新的�布用的地�是 %1$s。\n"
+"\n"
 
-#: lib/mail.php:249
+#: 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:253 lib/mail.php:512
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
-msgstr "%1$s (%2$s) ��了新的�人信�：\n\n"
+msgstr ""
+"%1$s (%2$s) ��了新的�人信�：\n"
+"\n"
 
-#: lib/mailbox.php:43
+#: 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:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
 msgstr "此表�会自动�交。"
 
-#: lib/personal.php:65
+#: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
 msgstr "收�夹"
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s 收�的通告"
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
 msgstr "用户"
 
-#: lib/personal.php:75
+#: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
 msgstr "收件箱"
 
-#: lib/personal.php:76
+#: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
 msgstr "您接收的消�"
 
-#: lib/personal.php:80
+#: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
 msgstr "�件箱"
 
-#: lib/personal.php:81
+#: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
 msgstr "您��的消�"
 
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
 msgstr "Twitter"
 
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
 msgstr "Twitter 整�选项"
 
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgid "To"
 msgstr "到"
 
-#: scripts/maildaemon.php:45
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "Could not parse message."
 msgstr "无法解�消�。"
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s �好�"
+
+#: actions/avatarsettings.php:76
+#, fuzzy
+msgid "You can upload your personal avatar."
+msgstr "您�以在这里更新个人信�。"
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Twitter 设置"
+
+#: 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
+#, fuzzy
+msgid "There was a problem with your session token. "
+msgstr "会�标识有问题，请�试。"
+
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
+
+#: 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
+#, 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
+#, fuzzy
+msgid "Unknown file type"
+msgstr "�支�这�类型的文件"
+
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#, fuzzy
+msgid "No profile specified."
+msgstr "没有收件人。"
+
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "没有找到此ID的信�。"
+
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "未找到用户"
+
+#: actions/block.php:129
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "确定�删除这�通告�？"
+
+#: actions/block.php:162
+#, fuzzy
+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
+#, fuzzy
+msgid "You are about to permanently delete a notice. "
+msgstr "您选择了永久删除通告。这样�是无法��的。"
+
+#: actions/disfavor.php:94
+#, fuzzy
+msgid "Add to favorites"
+msgstr "%s 的收�的��"
+
+#: actions/editgroup.php:54
+#, 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"
+msgstr ""
+
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#, fuzzy
+msgid "You must be logged in to create a group."
+msgstr "您必须登录�能邀请其他人使用 %s"
+
+#: 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
+#, fuzzy
+msgid "You must be an admin to edit the group"
+msgstr "您必须登录�能邀请其他人使用 %s"
+
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
+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/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "无法更新用户。"
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "设置已�存。"
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "等待确认此电���。"
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#, fuzzy
+msgid "Make a new email address for posting to; "
+msgstr "新的电�邮件地�，用于�布 %s 信�"
+
+#: actions/emailsettings.php:157
+#, fuzzy
+msgid "Send me email when someone "
+msgstr "如果收到�人信�，�邮件通知我。"
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+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!"
+msgstr ""
+
+#: actions/facebookhome.php:196
+#, php-format
+msgid "If you would like the %s app to automatically update "
+msgstr ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, 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"
+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/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:72
+#, fuzzy
+msgid "Invitations have been sent to the following users:"
+msgstr "已��邀请给这些人："
+
+#: actions/facebookinvite.php:96
+#, fuzzy, php-format
+msgid "You have been invited to %s"
+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:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
+msgstr ""
+
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "无法移除 Twitter 用户。"
+
+#: actions/facebooksettings.php:65
+#, fuzzy
+msgid "There was a problem saving your sync preferences!"
+msgstr "会�标识有问题，请�试。"
+
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "首选项已�存。"
+
+#: actions/facebooksettings.php:90
+#, fuzzy
+msgid "Automatically update my Facebook status with my notices."
+msgstr "自动将我的通告转�到 Twitter。"
+
+#: actions/facebooksettings.php:97
+#, fuzzy
+msgid "Send \"@\" replies to Facebook."
+msgstr "将这里的 \"@\" 回���到 Twitter。"
+
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "个人信�"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
+msgstr ""
+
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "首选项"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor favorite"
+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
+#, fuzzy
+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 ""
+
+#: 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/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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "头�已更新。"
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "更新头�失败。"
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+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. "
+msgstr "在 %%site.name%% 的用户信�中�索，�以�索姓��未知和爱好。"
+
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "�索用户"
+
+#: actions/imsettings.php:70
+#, fuzzy
+msgid "You can send and receive notices through "
+msgstr "无法�此用户��消�。"
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+#, fuzzy
+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
+#, fuzzy
+msgid "You must be logged in to join a group."
+msgstr "您必须登录�能邀请其他人使用 %s"
+
+#: actions/joingroup.php:95
+#, 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 "无法订阅用户：未找到。"
+
+#: actions/joingroup.php:135
+#, fuzzy, 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
+#, fuzzy
+msgid "You must be logged in to leave a group."
+msgstr "您必须登录�能邀请其他人使用 %s"
+
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "未找到此消�。"
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "您未告知此个人信�"
+
+#: actions/leavegroup.php:100
+#, fuzzy
+msgid "You may not leave a group while you are its administrator."
+msgstr "您�能删除其他用户的状�。"
+
+#: actions/leavegroup.php:130
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "无法更新用户记录。"
+
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "无法订阅用户：未找到。"
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "Could not create group."
+msgstr "无法创建收�。"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "无法删除订阅。"
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "文件超出大��制。"
+
+#: actions/newmessage.php:134
+#, fuzzy
+msgid "Don't send a message to yourself; "
+msgstr "无法�此用户��消�。"
+
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "通告"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
+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/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "OpenID 登录"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "移除OpenID"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Twitter 设置"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "�索"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "语言过长(�能超过50个字符)。"
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "修改密�"
+
+#: actions/passwordsettings.php:89
+#, 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 ""
+
+#: actions/peopletag.php:91
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+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"
+msgstr ""
+
+#: actions/profilesettings.php:144
+#, fuzzy
+msgid "Automatically subscribe to whoever "
+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
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "无法获�收�的通告。"
+
+#: actions/public.php:220
+#, 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 "公开的��"
+
+#: actions/publictagcloud.php:63
+#, 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
+#, fuzzy
+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
+#, 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"
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "用�超过140个字符�述您自己和您的爱好"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "你的�置，格�类似\"城市，�份，国家\""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+msgstr "除了��内容：密�，电�邮件，�时通讯��，电���。"
+
+#: actions/register.php:471
+#, fuzzy, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr "�贺你，%s�欢迎�到 %%%%site.name%%%%。在这里，您�以……"
+
+#: actions/register.php:495
+#, fuzzy
+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
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "%s 的回�"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s favorite notices, page %d"
+msgstr "%s 收�的通告"
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+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"
+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"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "%s 的通告��"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, 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 ""
+
+#: actions/showgroup.php:370
+msgid "All members"
+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 "
+msgstr ""
+
+#: actions/showmessage.php:98
+#, fuzzy
+msgid "Only the sender and recipient "
+msgstr "�有��和接��方�以阅读此消�。"
+
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid "%s, page %d"
+msgstr "%s 的收件箱 - 第 %d 页"
+
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "个人信�"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "用户没有个人信�。"
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+#, fuzzy
+msgid "User actions"
+msgstr "未知动作"
+
+#: actions/showstream.php:342
+#, fuzzy
+msgid "Send a direct message to this user"
+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"
+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 "
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "Mobile carrier"
+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 "订阅者"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %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
+#, 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 的通告。"
+
+#: 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
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+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
+#, fuzzy, php-format
+msgid "Tag %s"
+msgstr "标签"
+
+#: actions/tagother.php:141
+#, fuzzy
+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
+#, fuzzy
+msgid "There was a problem with your session token."
+msgstr "会�标识有问题，请�试。"
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+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."
+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."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "未找到"
+
+#: actions/twittersettings.php:71
+#, fuzzy
+msgid "Add your Twitter account to automatically send "
+msgstr "添加 Twitter ��，自动� Twitter ��更新。"
+
+#: actions/twittersettings.php:119
+#, fuzzy
+msgid "Twitter user name"
+msgstr "Twitter 用户�"
+
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Twitter 密�"
+
+#: actions/twittersettings.php:228
+#, fuzzy
+msgid "Twitter Friends"
+msgstr "Twitter 设置"
+
+#: 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 "无法从 Twitter 获�\"%s\"的��信�。"
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "�存用户时出错。"
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "�务器没有返回个人信�URL。"
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "没有找到此ID的信�。"
+
+#: actions/unsubscribe.php:71
+#, 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 ""
+
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "�存通告时出错。"
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:116
+#, fuzzy
+msgid "You are banned from posting notices on this site."
+msgstr ""
+"您的新的�布用的地�是 %1$s。\n"
+"\n"
+
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "更新头�失败。"
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr ""
+
+#: lib/action.php:130
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "关于"
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "修改密�"
+
+#: 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"
+msgstr ""
+
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "创建新��"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "没有这个 OpenID。"
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "帮助"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "新通告"
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "新通告"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "订阅"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+msgid "All "
+msgstr ""
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "未找到用户"
+
+#: lib/blockform.php:153
+msgid "Block"
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "%s 收�的通告"
+
+#: 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 "%s 收�的通告"
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+#, fuzzy
+msgid "Filter tags"
+msgstr "%s 标签的��"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
+
+#: lib/galleryaction.php:137
+#, fuzzy
+msgid "Tag"
+msgstr "标签"
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "您的主页��客或在其他站点的URL"
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "订阅"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "用�超过140个字符�述您自己和您的爱好"
+
+#: lib/groupeditform.php:158
+#, 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"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "登出"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+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
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "这个页���供您想�的媒体类型"
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "登录"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "�存"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "输入用户�和密�以登录。"
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "创建新��"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s 开始关注您的 %2$s 信�。"
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "�置：%s"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "主页：%s"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, fuzzy, php-format
+msgid "You've been nudged by %s"
+msgstr "您已得到确认。输入"
+
+#: lib/mail.php:465
+#, fuzzy, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
+"%1$s (%2$s) ��了新的�人信�：\n"
+"\n"
+
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr ""
+"%1$s 收�了您的 %2$s 通告。\n"
+"\n"
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+#, fuzzy
+msgid "From"
+msgstr " 从 "
+
+#: lib/messageform.php:110
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "删除通告"
+
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "��消�"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 个或更多字符"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "先�……"
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "无法删除通告。"
+
+#: lib/noticelist.php:451
+#, 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 ""
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr ""
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "无法�此用户��消�。"
+
+#: lib/personaltagcloudsection.php:56
+#, fuzzy, php-format
+msgid "Tags in %s's notices"
+msgstr "用户没有通告。"
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr ""
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr ""
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#, fuzzy
+msgid "Recent tags"
+msgstr "最近的标签"
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "用户"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "通告"
+
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "�索用户信�"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "远程订阅"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "订阅 %s"
+
+#: lib/subgroupnav.php:97
+#, 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"
+msgstr "使用这个表��邀请好�和�事加入。"
+
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "用户没有个人信�。"
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "订阅 %s"
+
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+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
+#, fuzzy
+msgid "Unsubscribe from this user"
+msgstr "�消订阅 %s"
+
+#, fuzzy
+#~ msgid "Code not yet ready."
+#~ msgstr "命令尚未实现。"
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "创建新��"
+
+#, fuzzy
+#~ msgid "Delete my account confirmation"
+#~ msgstr "无法删除电�邮件确认。"
+
+#, fuzzy
+#~ msgid "Check if you are sure you want to delete your account."
+#~ msgstr "确定�删除这�通告�？"
+
+#, fuzzy
+#~ msgid "Showing recently popular notices"
+#~ msgstr "�索通告内容"
diff --git a/locale/zh_TW/LC_MESSAGES/laconica.mo b/locale/zh_TW/LC_MESSAGES/laconica.mo
new file mode 100644
index 000000000..5864c82b3
--- /dev/null
+++ b/locale/zh_TW/LC_MESSAGES/laconica.mo
diff --git a/locale/zh_TW/LC_MESSAGES/laconica.po b/locale/zh_TW/LC_MESSAGES/laconica.po
new file mode 100644
index 000000000..922bdb927
--- /dev/null
+++ b/locale/zh_TW/LC_MESSAGES/laconica.po
@@ -0,0 +1,4752 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 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"
+"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
+#, 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 ""
+
+#: ../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/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 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 ""
+
+#: ../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
+#, php-format
+msgid "%s (%s)"
+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"
+msgstr "%s與好�"
+
+#: ../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
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所�供的微型"
+"部�格�務"
+
+#: ../lib/util.php:259 lib/util.php:275 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 ""
+
+#: ../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/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr "確�信已寄到你的線上�時通信箱。%s�給你得訊��先經�你的��。"
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55 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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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/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
+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 "更新個人圖�"
+
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+"等待確�此信箱。看看你的Jabber/GTalk是�有訊�指示下一步動作。(你加入%s到你的"
+"好�清單了嗎？)"
+
+#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+#: 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
+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 "無法讀�此%sURL的圖�"
+
+#: ../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 object)"
+
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
+msgid "Cannot normalize that Jabber ID"
+msgstr "此JabberID錯誤"
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../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"
+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/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+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."
+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 "好��單"
+
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#, php-format
+msgid "Could not create OpenID form: %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
+#, 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."
+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/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/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."
+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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 "授權錯誤(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/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+msgid "Error inserting remote profile"
+msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)"
+
+#: ../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 ""
+
+#: ../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 "個人首���錯誤"
+
+#: ../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/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 "舊密碼錯誤"
+
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
+msgid "Incorrect username or password."
+msgstr "使用者�稱或密碼錯誤"
+
+#: ../actions/recoverpassword.php:265
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr "我們已寄出一�信到你帳號中的信箱，告訴你如何�回你的密碼。"
+
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: 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"
+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 ""
+
+#: ../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 ""
+
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
+msgid "Invalid notice url"
+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."
+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 [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: 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 ""
+
+#: ../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 ""
+
+#: ../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 "用OpenID(%%doc.openid%%)帳號登入"
+
+#: ../actions/login.php:126
+#, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
+msgstr ""
+
+#: ../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 "�失或忘記密碼了嗎？"
+
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php: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 "何時加入會員的呢？"
+
+#: ../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."
+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 ""
+
+#: ../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: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 ""
+
+#: ../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/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/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
+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 ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+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 "ç„¡æ­¤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/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 "此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"
+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 ""
+
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+#: actions/remotesubscribe.php:152
+msgid "Not a valid profile URL (no XRDS defined)."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:143
+msgid "Not a valid profile URL (no YADIS document)."
+msgstr ""
+
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
+msgid "Not an image or corrupt file."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
+msgid "Not authorized."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73
+msgid "OpenID Account Setup"
+msgstr ""
+
+#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+msgid "OpenID Auto-Submit"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+msgid "OpenID Login"
+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/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/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 ""
+
+#: ../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
+msgid "Optionally add a personal message to the invitation."
+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 ""
+
+#: ../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/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/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"
+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"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/userauthorization.php:78
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user's notices. If you didn't just ask to subscribe to someone's notices, "
+"click \"Cancel\"."
+msgstr ""
+
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
+#: actions/imsettings.php:142
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr ""
+
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 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"
+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/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
+msgid "Public timeline"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: 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/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+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/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
+msgid "Remote profile with no matching profile"
+msgstr ""
+
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
+msgid "Remote subscribe"
+msgstr ""
+
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 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/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
+msgid "Remove OpenID"
+msgstr ""
+
+#: ../actions/openidsettings.php:73
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+
+#: ../lib/stream.php:55 lib/personal.php:55 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 ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: 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 ""
+
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: ../lib/util.php:304 lib/util.php:320 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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+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:191 actions/emailsettings.php:209
+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/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
+msgid "That is already your Jabber ID."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
+msgid "That is not your Jabber ID."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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/confirmaddress.php:92 actions/confirmaddress.php:92
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr ""
+
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: 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:"
+msgstr ""
+
+#: ../actions/userauthorization.php:322
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site's instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr ""
+
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
+msgid "These are the people who listen to your notices."
+msgstr ""
+
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr ""
+
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+msgid "These are the people whose notices you listen to."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr ""
+
+#: ../actions/recoverpassword.php:88
+msgid "This confirmation code is too old. Please start again."
+msgstr ""
+
+#: ../lib/openid.php:195
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
+#: 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 ""
+
+#: ../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"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:43
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: 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 ""
+
+#: ../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 ""
+
+#: ../lib/util.php:269 lib/util.php:285
+msgid ""
+"Unless otherwise specified, contents of this site are copyright by the "
+"contributors and available under the "
+msgstr ""
+
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
+msgid "Unsupported image file format."
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+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 ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, 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."
+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 ""
+
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
+msgid "User nickname"
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#, php-format
+msgid "What's up, %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\""
+msgstr ""
+
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
+#, php-format
+msgid "Wrong image type for '%s'"
+msgstr ""
+
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
+#, 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
+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!"
+msgstr ""
+
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/password.php:27
+msgid "You can change your password here. Choose a good one!"
+msgstr ""
+
+#: ../actions/register.php:135 actions/register.php:145
+msgid "You can create a new account to start posting notices."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../actions/openidsettings.php:86
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+
+#: ../actions/profilesettings.php:27
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: 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
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: 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 ""
+
+#: ../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 ""
+
+#: ../actions/recoverpassword.php:164
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+
+#: ../actions/openidsettings.php:28
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
+"account.  Manage your associated OpenIDs from here."
+msgstr ""
+
+#: ../lib/util.php:943 lib/util.php:992 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 ""
+
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#, php-format
+msgid "about %d hours ago"
+msgstr ""
+
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#, php-format
+msgid "about %d minutes ago"
+msgstr ""
+
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#, php-format
+msgid "about %d months ago"
+msgstr ""
+
+#: ../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/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/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53 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"
+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/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 ""
+
+#: 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
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53 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 ""
+
+#: 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 ""
+
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+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
+#, php-format
+msgid "Feed for favorites of %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 ""
+
+#: 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/showmessage.php:61 actions/showmessage.php:108
+#, 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"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, 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"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#, 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"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, 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."
+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/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#, php-format
+msgid "%s updates favorited by %s / %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 ""
+
+#: 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 ""
+
+#: 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/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 ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: 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 ""
+
+#: 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/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 ""
+
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96 classes/Command.php:113
+#, 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."
+msgstr ""
+
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175 classes/Command.php:198
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270 classes/Command.php:307
+#, 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"
+msgstr ""
+
+#: classes/Command.php:295 classes/Command.php:335
+#, 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."
+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 ""
+
+#: 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 ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253 lib/mail.php:512
+#, 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."
+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
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+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
+#, 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
+#, fuzzy
+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
+#, php-format
+msgid "The address \"%s\" has been "
+msgstr ""
+
+#: actions/deletenotice.php:73
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/editgroup.php:54
+#, 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"
+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
+#, 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"
+msgstr ""
+
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
+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/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "無法更新使用者"
+
+#: actions/editgroup.php:226
+msgid "Options saved."
+msgstr ""
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "確�碼發生錯誤"
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
+msgstr ""
+
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
+msgstr ""
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+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!"
+msgstr ""
+
+#: actions/facebookhome.php:196
+#, php-format
+msgid "If you would like the %s app to automatically update "
+msgstr ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, 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"
+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
+#, fuzzy
+msgid "Before"
+msgstr "之�的內容»"
+
+#: actions/facebookinvite.php:70
+#, 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:"
+msgstr ""
+
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
+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:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
+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!"
+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."
+msgstr ""
+
+#: actions/facebooksettings.php:106
+msgid "Prefix"
+msgstr ""
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, 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
+msgid "Disfavor favorite"
+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."
+msgstr ""
+
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+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/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
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "更新個人圖�"
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "無法上傳個人圖�"
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: 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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+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 "
+msgstr ""
+
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#, fuzzy
+msgid "Create a new group"
+msgstr "新增帳號"
+
+#: actions/groupsearch.php:57
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+msgstr ""
+
+#: actions/groupsearch.php:63
+msgid "Group search"
+msgstr ""
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
+msgstr ""
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+msgid "Send me replies through Jabber/GTalk "
+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."
+msgstr ""
+
+#: actions/joingroup.php:95
+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"
+
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
+msgstr ""
+
+#: 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
+#, fuzzy
+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 ""
+
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "無法從 %s 建立OpenID"
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: 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
+#, 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
+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 ""
+
+#: 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/openidlogin.php:97
+msgid "OpenID login"
+msgstr ""
+
+#: actions/openidsettings.php:128
+msgid "Removing your only OpenID "
+msgstr ""
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "線上�時通設定"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:112
+msgid "Service"
+msgstr ""
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "地點�長（共255個字）"
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "更改密碼"
+
+#: actions/passwordsettings.php:89
+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 ""
+
+#: actions/peopletag.php:91
+#, 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"
+msgstr ""
+
+#: actions/profilesettings.php:144
+msgid "Automatically subscribe to whoever "
+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
+#, php-format
+msgid "Public timeline, page %d"
+msgstr ""
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/public.php:220
+#, 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"
+msgstr ""
+
+#: actions/publictagcloud.php:63
+#, 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
+#, fuzzy
+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 ""
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "請在140個字以內�述你自己與你的興趣"
+
+#: actions/register.php:410
+msgid "Where you are, like \"City, "
+msgstr ""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+msgstr "�包�這些個人資料：密碼�電�信箱�線上�時通信箱�電話號碼"
+
+#: actions/register.php:471
+#, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr ""
+
+#: 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 ""
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
+msgstr ""
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+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"
+msgstr ""
+
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+msgid "Note"
+msgstr ""
+
+#: actions/showgroup.php:270
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, php-format
+msgid "Notice feed for %s group"
+msgstr ""
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, 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 ""
+
+#: actions/showgroup.php:370
+msgid "All members"
+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 "
+msgstr ""
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
+msgstr ""
+
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
+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"
+msgstr ""
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr ""
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "所有訂閱"
+
+#: actions/showstream.php:533
+msgid "All groups"
+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 "
+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; "
+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"
+msgstr ""
+
+#: actions/subedit.php:70
+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 "此帳號已註冊"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr ""
+
+#: actions/subscribers.php:63
+msgid "These are the people who listen to "
+msgstr ""
+
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who "
+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 "
+msgstr ""
+
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose "
+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
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+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
+#, 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."
+msgstr ""
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+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."
+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."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "目�無請求"
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
+msgstr ""
+
+#: actions/twittersettings.php:126
+#, 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 "無法�消信箱確�"
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "儲存使用者發生錯誤"
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "無確�請求"
+
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:71
+#, 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 ""
+
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "儲存使用者發生錯誤"
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+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"
+msgstr ""
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328
+#, fuzzy
+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 ""
+
+#: lib/action.php:332
+msgid "Logout from the site"
+msgstr ""
+
+#: lib/action.php:335
+msgid "Login to the site"
+msgstr ""
+
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "新增帳號"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "ç„¡æ­¤OpenID"
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "求救"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "新訊�"
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "新訊�"
+
+#: lib/action.php:562
+msgid "Secondary site navigation"
+msgstr ""
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+msgid "All "
+msgstr ""
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "無此使用者"
+
+#: lib/blockform.php:153
+msgid "Block"
+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/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr ""
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
+
+#: lib/galleryaction.php:137
+msgid "Tag"
+msgstr ""
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+msgid "URL of the homepage or blog of the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "所有訂閱"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "請在140個字以內�述你自己與你的興趣"
+
+#: lib/groupeditform.php:158
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "登出"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+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
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "個人首���錯誤"
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "登入"
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr ""
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "使用者�稱或密碼無效"
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "新增帳號"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "�在%1$s在%2$s�為你的粉絲囉"
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "地點"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "個人首�"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
+
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "�在%1$s在%2$s�為你的粉絲囉"
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
+msgstr ""
+
+#: lib/messageform.php:110
+msgid "Send a direct notice"
+msgstr ""
+
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "新訊�"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6個以上字元"
+
+#: lib/noticelist.php:426
+msgid "in reply to"
+msgstr ""
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
+msgstr ""
+
+#: lib/noticelist.php:451
+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 ""
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr ""
+
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr ""
+
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr ""
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr ""
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
+msgstr ""
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90
+msgid "Popular"
+msgstr ""
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "新訊�"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr ""
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "無此訂閱"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "此帳號已註冊"
+
+#: lib/subgroupnav.php:97
+#, 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 ""
+
+#: lib/subs.php:53
+msgid "User has blocked you."
+msgstr ""
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr ""
+
+#: lib/tagcloudsection.php:56
+msgid "None"
+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 ""
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "新增帳號"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "無法確�信箱"
+
+#~ msgid "Email address"
+#~ msgstr "電�信箱"
+
+#~ msgid "Error inserting notice"
+#~ 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 "若忘記或�失密碼，我們會寄新的密碼到你帳號中的信箱。"
diff --git a/locale/zh_hant/LC_MESSAGES/laconica.po b/locale/zh_hant/LC_MESSAGES/laconica.po
deleted file mode 100644
index 5e96c56fb..000000000
--- a/locale/zh_hant/LC_MESSAGES/laconica.po
+++ /dev/null
@@ -1,2985 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../actions/noticesearchrss.php:64
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "�尋 \"%s\"相關資料"
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
-msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
-msgstr "�包�這些個人資料：密碼�電�信箱�線上�時通信箱�電話號碼"
-
-#: ../actions/subscribe.php:84
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "�在%1$s在%2$s�為你的粉絲囉"
-
-#: ../actions/subscribe.php:86
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
-msgstr ""
-"�在%1$s在%2$s�為你的粉絲囉。\n"
-"\n\t%3$s\n\n\n%4$s.\n敬上。"
-
-#: ../actions/shownotice.php:45
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s的狀態是%2$s"
-
-#: ../actions/publicrss.php:60
-#, php-format
-msgid "%s Public Stream"
-msgstr "%s的公開內容"
-
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
-#, php-format
-msgid "%s and friends"
-msgstr "%s與好�"
-
-#: ../lib/util.php:233
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
-msgstr ""
-"*"
-"*"
-"%"
-"%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所�供的微型部�格�務"
-
-#: ../lib/util.php:235
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%**是個微型部�格"
-
-#: ../lib/util.php:250 ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr "必須注明作者姓�或昵稱."
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64個�寫英文字�或數字，勿加標點符號或空格"
-
-#: ../actions/password.php:42 ../actions/register.php:178
-msgid "6 or more characters"
-msgstr "6個以上字元"
-
-#: ../actions/recoverpassword.php:165
-msgid "6 or more characters, and don't forget it!"
-msgstr "6個或6個以上字元，別忘了自己密碼喔"
-
-#: ../actions/imsettings.php:188
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
-msgstr "確�信已寄到你的線上�時通信箱。%s�給你得訊��先經�你的��。"
-
-#: ../lib/util.php:296
-msgid "About"
-msgstr "關於"
-
-#: ../actions/userauthorization.php:118
-msgid "Accept"
-msgstr "接�"
-
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
-msgid "Add"
-msgstr "新增"
-
-#: ../actions/openidsettings.php:43
-msgid "Add OpenID"
-msgstr "新增OpenID"
-
-#: ../actions/imsettings.php:39
-msgid "Address"
-msgstr "ä¿¡ç®±"
-
-#: ../actions/showstream.php:254
-msgid "All subscriptions"
-msgstr "所有訂閱"
-
-#: ../actions/publicrss.php:62
-#, php-format
-msgid "All updates for %s"
-msgstr "%s的所有新增內容"
-
-#: ../actions/noticesearchrss.php:66
-#, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "所有符� \"%s\"的更新"
-
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
-msgid "Already logged in."
-msgstr "已登入"
-
-#: ../actions/subscribe.php:48
-msgid "Already subscribed!."
-msgstr "此帳號已註冊"
-
-#: ../actions/userauthorization.php:76
-msgid "Authorize subscription"
-msgstr "註冊確�"
-
-#: ../actions/login.php:100 ../actions/register.php:184
-msgid "Automatically login in the future; not for shared computers!"
-msgstr "未來在�一部電腦自動登入"
-
-#: ../actions/avatar.php:32
-msgid "Avatar"
-msgstr "個人圖�"
-
-#: ../actions/avatar.php:113
-msgid "Avatar updated."
-msgstr "更新個人圖�"
-
-#: ../actions/imsettings.php:55
-#, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
-msgstr "等待確�此信箱。看看你的Jabber/GTalk是�有訊�指示下一步動作。(你加入%s到你的好�清單了嗎？)"
-
-#: ../lib/util.php:1136
-msgid "Before »"
-msgstr "之�的內容»"
-
-#: ../actions/profilesettings.php:52
-msgid "Bio"
-msgstr "自我介紹"
-
-#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
-msgid "Bio is too long (max 140 chars)."
-msgstr "自我介紹�長(共140個字元)"
-
-#: ../actions/updateprofile.php:118
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "無法讀�此%sURL的圖�"
-
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
-msgid "Can't save new password."
-msgstr "無法存�新密碼"
-
-#: ../actions/imsettings.php:59
-msgid "Cancel"
-msgstr "�消"
-
-#: ../lib/openid.php:121 lib/openid.php:121
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "無法�始化OpenID用戶�象(consumer object)"
-
-#: ../actions/imsettings.php:154
-msgid "Cannot normalize that Jabber ID"
-msgstr "此JabberID錯誤"
-
-#: ../actions/password.php:45
-msgid "Change"
-msgstr "更改"
-
-#: ../actions/password.php:32
-msgid "Change password"
-msgstr "更改密碼"
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
-msgid "Confirm"
-msgstr "確�"
-
-#: ../actions/confirmaddress.php:84
-msgid "Confirm Address"
-msgstr "確�信箱"
-
-#: ../actions/imsettings.php:213
-msgid "Confirmation cancelled."
-msgstr "確��消"
-
-#: ../actions/confirmaddress.php:38
-msgid "Confirmation code not found."
-msgstr "確�碼�失"
-
-#: ../actions/finishopenidlogin.php:91
-msgid "Connect"
-msgstr "連�"
-
-#: ../actions/finishopenidlogin.php:86
-msgid "Connect existing account"
-msgstr "與�有帳號連�"
-
-#: ../lib/util.php:304
-msgid "Contact"
-msgstr "好��單"
-
-#: ../lib/openid.php:178 lib/openid.php:178
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "無法從 %s 建立OpenID"
-
-#: ../lib/openid.php:160
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "無法連�到伺�器:%s"
-
-#: ../actions/updateprofile.php:161
-msgid "Could not save avatar info"
-msgstr "無法存�個人圖�資料"
-
-#: ../actions/updateprofile.php:154
-msgid "Could not save new profile info"
-msgstr "無法存�新的個人資料"
-
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "無法確�信箱"
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "無法轉�請求標記以致無法存�標記"
-
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "註冊失敗"
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
-msgid "Couldn't delete email confirmation."
-msgstr "無法�消信箱確�"
-
-#: ../actions/unsubscribe.php:56
-msgid "Couldn't delete subscription."
-msgstr "無法刪除帳號"
-
-#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
-msgid "Couldn't get a request token."
-msgstr "無法�得轉�標記"
-
-#: ../actions/imsettings.php:178
-msgid "Couldn't insert confirmation code."
-msgstr "無法輸入確�碼"
-
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
-msgid "Couldn't insert new subscription."
-msgstr "無法新增訂閱"
-
-#: ../actions/profilesettings.php:175
-msgid "Couldn't save profile."
-msgstr "無法儲存個人資料"
-
-#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
-msgid "Couldn't update user."
-msgstr "無法更新使用者"
-
-#: ../actions/finishopenidlogin.php:84
-msgid "Create"
-msgstr "新增"
-
-#: ../actions/finishopenidlogin.php:70
-msgid "Create a new user with this nickname."
-msgstr "以此暱稱新增使用者"
-
-#: ../actions/finishopenidlogin.php:68
-msgid "Create new account"
-msgstr "新增帳號"
-
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-msgid "Creating new account for OpenID that already has a user."
-msgstr "該OpenID已經注冊"
-
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "目�已確�的Jabber/Gtalk地�"
-
-#: ../actions/showstream.php:337
-msgid "Currently"
-msgstr "目�"
-
-#: ../lib/util.php:893 ../lib/util.php:1061 lib/util.php:1110
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "增加回覆時,資料庫發生錯誤: %s"
-
-#: ../actions/profilesettings.php:54 ../actions/profilesettings.php:51
-#: ../actions/register.php:172 actions/profilesettings.php:84
-#: actions/register.php:186
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "請在140個字以內�述你自己與你的興趣"
-
-#: ../actions/register.php:181 ../actions/register.php:158
-#: ../actions/register.php:161 ../lib/settingsaction.php:87
-#: actions/register.php:172 actions/register.php:175 lib/settingsaction.php:87
-msgid "Email"
-msgstr "電�信箱"
-
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "電�信箱"
-
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
-#: ../actions/register.php:73 actions/register.php:80
-msgid "Email address already exists."
-msgstr "此電�信箱已註冊�了"
-
-#: ../lib/mail.php:82 ../lib/mail.php:90 lib/mail.php:90
-msgid "Email address confirmation"
-msgstr "確�信箱"
-
-#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
-#: actions/recoverpassword.php:197
-msgid "Enter a nickname or email address."
-msgstr "請輸入暱稱或電�信箱"
-
-#: ../actions/userauthorization.php:136 ../actions/userauthorization.php:137
-#: actions/userauthorization.php:144
-msgid "Error authorizing token"
-msgstr "授權錯誤(Error authorizing token)"
-
-#: ../actions/finishopenidlogin.php:282 ../actions/finishopenidlogin.php:253
-#: actions/finishopenidlogin.php:259
-msgid "Error connecting user to OpenID."
-msgstr "連接OpenID時發生錯誤"
-
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-msgid "Error connecting user."
-msgstr "連接用戶時發生錯誤(Error connecting user.)"
-
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
-msgid "Error inserting avatar"
-msgstr "個人圖��入錯誤"
-
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
-msgid "Error inserting new profile"
-msgstr "新的更人資料輸入錯誤"
-
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "新增訊�時發生錯誤"
-
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
-msgid "Error inserting remote profile"
-msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)"
-
-#: ../actions/recoverpassword.php:201 ../actions/recoverpassword.php:240
-#: actions/recoverpassword.php:246
-msgid "Error saving address confirmation."
-msgstr "儲存信箱確�發生錯誤"
-
-#: ../actions/userauthorization.php:139 ../actions/userauthorization.php:140
-#: actions/userauthorization.php:147
-msgid "Error saving remote profile"
-msgstr "儲存�端個人資料發生錯誤"
-
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
-#: lib/openid.php:226
-msgid "Error saving the profile."
-msgstr "儲存個人資料發生錯誤"
-
-#: ../lib/openid.php:237 lib/openid.php:237
-msgid "Error saving the user."
-msgstr "儲存使用者發生錯誤"
-
-#: ../actions/password.php:80 actions/profilesettings.php:399
-msgid "Error saving user; invalid."
-msgstr "儲存使用者發生錯誤;使用者�稱無效"
-
-#: ../actions/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108
-msgid "Error setting user."
-msgstr "使用者設定發生錯誤"
-
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-msgid "Error updating profile"
-msgstr "更新個人資料發生錯誤"
-
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
-msgid "Error updating remote profile"
-msgstr "更新�端個人資料發生錯誤"
-
-#: ../actions/recoverpassword.php:79 ../actions/recoverpassword.php:80
-#: actions/recoverpassword.php:80
-msgid "Error with confirmation code."
-msgstr "確�碼發生錯誤"
-
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-msgid "Existing nickname"
-msgstr "這個暱稱已有人用了喔"
-
-#: ../lib/util.php:298 ../lib/util.php:326 lib/util.php:342
-msgid "FAQ"
-msgstr "常見�題"
-
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-msgid "Failed updating avatar."
-msgstr "無法上傳個人圖�"
-
-#: ../actions/all.php:61 ../actions/allrss.php:74 ../actions/allrss.php:64
-#: actions/all.php:61 actions/allrss.php:64
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "發�給%s好�的訂閱"
-
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
-#: ../actions/replies.php:65 actions/replies.php:65 actions/repliesrss.php:66
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "回應給%s的訂閱"
-
-#: ../actions/login.php:118 ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr "為安全起見，請先�新輸入你的使用者�稱與密碼�更改設定。"
-
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-msgid "Full name"
-msgstr "全�"
-
-#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-msgid "Full name is too long (max 255 chars)."
-msgstr "全��長（最多255字元）"
-
-#: ../lib/util.php:279 ../lib/util.php:322 lib/util.php:338
-msgid "Help"
-msgstr "求救"
-
-#: ../lib/util.php:274 ../lib/util.php:298 lib/util.php:314
-msgid "Home"
-msgstr "主�"
-
-#: ../actions/profilesettings.php:49 ../actions/profilesettings.php:46
-#: ../actions/register.php:167 actions/profilesettings.php:79
-#: actions/register.php:181
-msgid "Homepage"
-msgstr "個人首�"
-
-#: ../actions/profilesettings.php:87 ../actions/profilesettings.php:95
-#: ../actions/register.php:76 actions/profilesettings.php:210
-#: actions/register.php:83
-msgid "Homepage is not a valid URL."
-msgstr "個人首���錯誤"
-
-#: ../actions/imsettings.php:61 ../actions/imsettings.php:60
-#: actions/imsettings.php:61
-msgid "IM Address"
-msgstr "線上�時通信箱"
-
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-msgid "IM Settings"
-msgstr "線上�時通設定"
-
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr "若已經註冊�了，請輸入使用者�稱與密碼連�到你的OpenID。"
-
-#: ../actions/openidsettings.php:45
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr "若想新增OpenID到你的帳號，請在下方空格輸入並勾�『新增�"
-
-#: ../actions/recoverpassword.php:122
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
-"email address you have stored  in your account."
-msgstr "若忘記或�失密碼，我們會寄新的密碼到你帳號中的信箱。"
-
-#: ../actions/password.php:69 actions/profilesettings.php:388
-msgid "Incorrect old password"
-msgstr "舊密碼錯誤"
-
-#: ../actions/login.php:63 ../actions/login.php:67 actions/login.php:67
-msgid "Incorrect username or password."
-msgstr "使用者�稱或密碼錯誤"
-
-#: ../actions/recoverpassword.php:226 ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr "我們已寄出一�信到你帳號中的信箱，告訴你如何�回你的密碼。"
-
-#: ../actions/updateprofile.php:113 ../actions/updateprofile.php:114
-#: actions/updateprofile.php:115
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "個人圖�連�%s無效"
-
-#: ../actions/updateprofile.php:97 ../actions/updateprofile.php:98
-#: actions/updateprofile.php:99
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "個人首�連�%s無效"
-
-#: ../actions/updateprofile.php:81 ../actions/updateprofile.php:82
-#: actions/updateprofile.php:83
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr ""
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-msgid "Invalid notice content"
-msgstr ""
-
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-msgid "Invalid notice uri"
-msgstr ""
-
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-msgid "Invalid notice url"
-msgstr ""
-
-#: ../actions/updateprofile.php:86 ../actions/updateprofile.php:87
-#: actions/updateprofile.php:88
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "個人資料連�%s無效"
-
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-msgid "Invalid profile URL (bad format)"
-msgstr "個人資料連�無效(格�錯誤)"
-
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
-msgid "Invalid profile URL returned by server."
-msgstr ""
-
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-msgid "Invalid size."
-msgstr "尺寸錯誤"
-
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84 ../actions/finishopenidlogin.php:235
-#: ../actions/register.php:93 ../actions/register.php:111
-#: actions/finishopenidlogin.php:241 actions/register.php:103
-#: actions/register.php:121
-msgid "Invalid username or password."
-msgstr "使用者�稱或密碼無效"
-
-#: ../lib/util.php:237 ../lib/util.php:261 lib/util.php:277
-#, php-format
-msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-
-#: ../actions/imsettings.php:164 ../actions/imsettings.php:173
-#: actions/imsettings.php:181
-msgid "Jabber ID already belongs to another user."
-msgstr "此Jabber ID已有人使用"
-
-#: ../actions/imsettings.php:63 ../actions/imsettings.php:62
-#: actions/imsettings.php:63
-#, php-format
-msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
-msgstr ""
-
-#: ../actions/profilesettings.php:55 ../actions/profilesettings.php:52
-#: ../actions/register.php:173 actions/profilesettings.php:85
-#: actions/register.php:187
-msgid "Location"
-msgstr "地點"
-
-#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-msgid "Location is too long (max 255 chars)."
-msgstr "地點�長（共255個字）"
-
-#: ../actions/login.php:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286 ../actions/login.php:97
-#: ../actions/login.php:106 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-msgid "Login"
-msgstr "登入"
-
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "用OpenID(%%doc.openid%%)帳號登入"
-
-#: ../actions/login.php:122 ../actions/login.php:126
-#, php-format
-msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
-msgstr ""
-"è"
-"¼"
-"¸"
-"å"
-"…"
-"¥"
-"ä"
-"½"
-"¿"
-"ç"
-"”"
-"¨"
-"è"
-"€"
-"…"
-"å"
-"�"
-"�"
-"ç"
-"¨"
-"±èˆ‡å¯†ç¢¼ç™»å…¥ã€‚還沒有使用者å��稱嗎？[註冊](%%action.register%%)一個新帳號，或使用[OpenID](%%action.openidlogin%%)。"
-
-#: ../lib/util.php:284 ../lib/util.php:308 lib/util.php:324
-msgid "Logout"
-msgstr "登出"
-
-#: ../actions/login.php:106 ../actions/login.php:110 actions/login.php:110
-msgid "Lost or forgotten password?"
-msgstr "�失或忘記密碼了嗎？"
-
-#: ../actions/showstream.php:281 ../actions/showstream.php:300
-#: actions/showstream.php:315
-msgid "Member since"
-msgstr "何時加入會員的呢？"
-
-#: ../actions/userrss.php:70 actions/userrss.php:67
-#, php-format
-msgid "Microblog by %s"
-msgstr "&s的微型部�格"
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
-#: ../actions/register.php:188 actions/finishopenidlogin.php:85
-#: actions/register.php:202
-msgid "My text and files are available under "
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-msgid "New nickname"
-msgstr "新暱稱"
-
-#: ../actions/newnotice.php:100 ../actions/newnotice.php:87
-#: actions/newnotice.php:96
-msgid "New notice"
-msgstr "新訊�"
-
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
-#: ../actions/recoverpassword.php:179 actions/profilesettings.php:180
-#: actions/recoverpassword.php:185
-msgid "New password"
-msgstr "新密碼"
-
-#: ../actions/recoverpassword.php:275 ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "新密碼已儲存�功。你已登入。"
-
-#: ../actions/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175 ../actions/login.php:101
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-msgid "Nickname"
-msgstr "暱稱"
-
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-msgid "Nickname already in use. Try another one."
-msgstr "此暱稱已有人使用。�試試看別的�。"
-
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
-#: ../actions/profilesettings.php:88 ../actions/register.php:67
-#: ../actions/updateprofile.php:77 actions/finishopenidlogin.php:171
-#: actions/profilesettings.php:203 actions/register.php:74
-#: actions/updateprofile.php:78
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "暱稱請用�寫字�或數字，勿加空格。"
-
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-msgid "Nickname not allowed."
-msgstr "此暱稱無法使用"
-
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-msgid "Nickname of the user you want to follow"
-msgstr "你想�為誰的粉絲呢？請輸入他/她的暱稱。"
-
-#: ../actions/recoverpassword.php:147 ../actions/recoverpassword.php:162
-#: actions/recoverpassword.php:167
-msgid "Nickname or email"
-msgstr "暱稱或信箱"
-
-#: ../actions/imsettings.php:147 ../actions/imsettings.php:156
-#: actions/imsettings.php:164
-msgid "No Jabber ID."
-msgstr "查無此Jabber ID"
-
-#: ../actions/userauthorization.php:128 ../actions/userauthorization.php:129
-#: actions/userauthorization.php:136
-msgid "No authorization request!"
-msgstr "無確�請求"
-
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-msgid "No confirmation code."
-msgstr "無確�碼"
-
-#: ../actions/newnotice.php:49 ../actions/newnotice.php:44
-#: actions/newmessage.php:53 actions/newnotice.php:44 classes/Command.php:197
-msgid "No content!"
-msgstr "無內容"
-
-#: ../actions/userbyid.php:27 ../actions/userbyid.php:32
-#: actions/userbyid.php:32
-msgid "No id."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
-msgid "No nickname provided by remote server."
-msgstr "無�端伺�器�供的暱稱"
-
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-msgid "No nickname."
-msgstr "無暱稱"
-
-#: ../actions/imsettings.php:197 ../actions/emailsettings.php:222
-#: ../actions/imsettings.php:206 ../actions/smssettings.php:229
-#: actions/emailsettings.php:240 actions/imsettings.php:214
-#: actions/smssettings.php:237
-msgid "No pending confirmation to cancel."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
-msgid "No profile URL returned by server."
-msgstr ""
-
-#: ../actions/recoverpassword.php:189 ../actions/recoverpassword.php:226
-#: actions/recoverpassword.php:232
-msgid "No registered email address for that user."
-msgstr "查無此使用者所註冊的信箱"
-
-#: ../actions/userauthorization.php:48 ../actions/userauthorization.php:49
-#: actions/userauthorization.php:55
-msgid "No request found!"
-msgstr "目�無請求"
-
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-msgid "No results"
-msgstr "無�果"
-
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-msgid "No size."
-msgstr "無尺寸"
-
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-msgid "No such OpenID."
-msgstr "ç„¡æ­¤OpenID"
-
-#: ../actions/doc.php:29 actions/doc.php:29
-msgid "No such document."
-msgstr "無此文件"
-
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
-#: ../actions/shownotice.php:83 ../lib/deleteaction.php:30
-#: actions/shownotice.php:32 actions/shownotice.php:83 lib/deleteaction.php:30
-msgid "No such notice."
-msgstr "無此通知"
-
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-msgid "No such recovery code."
-msgstr "無此�復碼"
-
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-msgid "No such subscription"
-msgstr "無此訂閱"
-
-#: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
-#: ../actions/foaf.php:40 ../actions/replies.php:57
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/xrds.php:35 ../lib/gallery.php:57 ../lib/subs.php:33
-#: ../lib/subs.php:82 actions/all.php:34 actions/allrss.php:35
-#: actions/avatarbynickname.php:43 actions/favoritesrss.php:35
-#: actions/foaf.php:40 actions/ical.php:31 actions/remotesubscribe.php:93
-#: actions/remotesubscribe.php:100 actions/replies.php:57
-#: actions/repliesrss.php:35 actions/showfavorites.php:34
-#: actions/showstream.php:110 actions/userbyid.php:36 actions/userrss.php:35
-#: actions/xrds.php:35 classes/Command.php:120 classes/Command.php:162
-#: classes/Command.php:203 classes/Command.php:237 lib/gallery.php:62
-#: lib/mailbox.php:36 lib/subs.php:33 lib/subs.php:95
-msgid "No such user."
-msgstr "無此使用者"
-
-#: ../lib/gallery.php:76 ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-msgid "Not a recovery code."
-msgstr "此�復碼錯誤"
-
-#: ../actions/imsettings.php:158 ../actions/imsettings.php:167
-#: actions/imsettings.php:175
-msgid "Not a valid Jabber ID"
-msgstr "此JabberID無效"
-
-#: ../lib/openid.php:131 lib/openid.php:131
-msgid "Not a valid OpenID."
-msgstr "此OpenID無效"
-
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
-#: ../actions/register.php:63 actions/register.php:70
-msgid "Not a valid email address."
-msgstr "此信箱無效"
-
-#: ../actions/profilesettings.php:83 ../actions/register.php:61
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-msgid "Not a valid nickname."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:118 ../actions/remotesubscribe.php:120
-#: actions/remotesubscribe.php:129
-msgid "Not a valid profile URL (incorrect services)."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:111 ../actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:122
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr ""
-
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-msgid "Not an image or corrupt file."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
-msgid "Not authorized."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
-msgid "Not expecting this response!"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
-#: ../actions/logout.php:33 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: actions/disfavor.php:29 actions/favor.php:30 actions/finishaddopenid.php:29
-#: actions/logout.php:33 actions/newmessage.php:28 actions/newnotice.php:29
-#: actions/subscribe.php:28 actions/unsubscribe.php:25 lib/deleteaction.php:38
-#: lib/settingsaction.php:27
-msgid "Not logged in."
-msgstr ""
-
-#: ../actions/unsubscribe.php:43 ../lib/subs.php:91 lib/subs.php:104
-msgid "Not subscribed!."
-msgstr ""
-
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#, php-format
-msgid "Notice feed for %s"
-msgstr ""
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-msgid "Notice has no profile"
-msgstr ""
-
-#: ../actions/showstream.php:297 ../actions/showstream.php:316
-#: actions/showstream.php:331
-msgid "Notices"
-msgstr ""
-
-#: ../actions/password.php:39 actions/profilesettings.php:178
-msgid "Old password"
-msgstr ""
-
-#: ../lib/util.php:288 ../lib/settingsaction.php:96 ../lib/util.php:314
-#: lib/settingsaction.php:90 lib/util.php:330
-msgid "OpenID"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-msgid "OpenID Account Setup"
-msgstr ""
-
-#: ../lib/openid.php:180 lib/openid.php:180
-msgid "OpenID Auto-Submit"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-msgid "OpenID Login"
-msgstr ""
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-msgid "OpenID URL"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-msgid "OpenID authentication cancelled."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr ""
-
-#: ../lib/openid.php:133 lib/openid.php:133
-#, php-format
-msgid "OpenID failure: %s"
-msgstr ""
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-msgid "OpenID removed."
-msgstr ""
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-msgid "OpenID settings"
-msgstr ""
-
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-msgid "Partial upload."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
-#: actions/finishopenidlogin.php:96 actions/login.php:102
-#: actions/register.php:167
-msgid "Password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:249 ../actions/recoverpassword.php:288
-#: actions/recoverpassword.php:301
-msgid "Password and confirmation do not match."
-msgstr ""
-
-#: ../actions/recoverpassword.php:245 ../actions/recoverpassword.php:284
-#: actions/recoverpassword.php:297
-msgid "Password must be 6 chars or more."
-msgstr ""
-
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-msgid "Password recovery requested"
-msgstr ""
-
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
-#: ../actions/recoverpassword.php:313 actions/profilesettings.php:408
-#: actions/recoverpassword.php:326
-msgid "Password saved."
-msgstr ""
-
-#: ../actions/password.php:61 ../actions/register.php:65
-#: ../actions/register.php:88 actions/profilesettings.php:380
-#: actions/register.php:98
-msgid "Passwords don't match."
-msgstr ""
-
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-msgid "People search"
-msgstr ""
-
-#: ../lib/stream.php:44 ../lib/stream.php:50 lib/personal.php:50
-msgid "Personal"
-msgstr ""
-
-#: ../actions/userauthorization.php:77 ../actions/userauthorization.php:78
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user's notices. If you didn't just ask to subscribe to someone's notices, "
-"click \"Cancel\"."
-msgstr ""
-
-#: ../actions/imsettings.php:74 ../actions/imsettings.php:73
-#: actions/imsettings.php:74
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
-
-#: ../actions/imsettings.php:68 ../actions/emailsettings.php:85
-#: ../actions/imsettings.php:67 ../actions/smssettings.php:94
-#: actions/emailsettings.php:86 actions/imsettings.php:68
-#: actions/smssettings.php:94 actions/twittersettings.php:70
-msgid "Preferences"
-msgstr ""
-
-#: ../actions/imsettings.php:135 ../actions/emailsettings.php:162
-#: ../actions/imsettings.php:144 ../actions/smssettings.php:163
-#: actions/emailsettings.php:180 actions/imsettings.php:152
-#: actions/smssettings.php:171
-msgid "Preferences saved."
-msgstr ""
-
-#: ../lib/util.php:300 ../lib/util.php:328 lib/util.php:344
-msgid "Privacy"
-msgstr ""
-
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119
-msgid "Problem saving notice."
-msgstr ""
-
-#: ../lib/stream.php:54 ../lib/settingsaction.php:84 ../lib/stream.php:60
-#: lib/personal.php:60 lib/settingsaction.php:84
-msgid "Profile"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-msgid "Profile URL"
-msgstr ""
-
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-msgid "Profile settings"
-msgstr ""
-
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
-#: ../actions/updateprofile.php:52 actions/postnotice.php:52
-#: actions/updateprofile.php:53
-msgid "Profile unknown"
-msgstr ""
-
-#: ../lib/util.php:276
-msgid "Public"
-msgstr ""
-
-#: ../actions/public.php:54 actions/public.php:54
-msgid "Public Stream Feed"
-msgstr ""
-
-#: ../actions/public.php:33 actions/public.php:33
-msgid "Public timeline"
-msgstr ""
-
-#: ../actions/recoverpassword.php:151 ../actions/recoverpassword.php:166
-#: actions/recoverpassword.php:171
-msgid "Recover"
-msgstr ""
-
-#: ../actions/recoverpassword.php:141 ../actions/recoverpassword.php:156
-#: actions/recoverpassword.php:161
-msgid "Recover password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-msgid "Recovery code for unknown user."
-msgstr ""
-
-#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-msgid "Register"
-msgstr ""
-
-#: ../actions/userauthorization.php:119 ../actions/userauthorization.php:120
-#: actions/userauthorization.php:127
-msgid "Reject"
-msgstr ""
-
-#: ../actions/login.php:99 ../actions/register.php:183
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190
-msgid "Remember me"
-msgstr ""
-
-#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
-msgid "Remote profile with no matching profile"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-msgid "Remote subscribe"
-msgstr ""
-
-#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
-#: actions/emailsettings.php:48 actions/emailsettings.php:76
-#: actions/imsettings.php:49 actions/openidsettings.php:108
-#: actions/smssettings.php:50 actions/smssettings.php:84
-#: actions/twittersettings.php:59
-msgid "Remove"
-msgstr ""
-
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-msgid "Remove OpenID"
-msgstr ""
-
-#: ../actions/openidsettings.php:73
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-
-#: ../lib/stream.php:49 ../lib/stream.php:55 lib/personal.php:55
-msgid "Replies"
-msgstr ""
-
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
-#: ../lib/stream.php:56 actions/replies.php:47 actions/repliesrss.php:62
-#: lib/personal.php:56
-#, php-format
-msgid "Replies to %s"
-msgstr ""
-
-#: ../actions/recoverpassword.php:168 ../actions/recoverpassword.php:183
-#: actions/recoverpassword.php:189
-msgid "Reset"
-msgstr ""
-
-#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
-msgid "Reset password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-msgid "Same as password above"
-msgstr ""
-
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
-#: actions/emailsettings.php:104 actions/imsettings.php:82
-#: actions/profilesettings.php:101 actions/smssettings.php:100
-#: actions/twittersettings.php:83
-msgid "Save"
-msgstr ""
-
-#: ../lib/searchaction.php:73 ../lib/util.php:277 ../lib/searchaction.php:84
-#: ../lib/util.php:300 lib/searchaction.php:84 lib/util.php:316
-msgid "Search"
-msgstr ""
-
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-msgid "Search Stream Feed"
-msgstr ""
-
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#, php-format
-msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
-msgstr ""
-
-#: ../actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-"Separate the terms by spaces; they must be 3 characters or more."
-msgstr ""
-
-#: ../lib/util.php:982 ../actions/invite.php:137 ../lib/util.php:1172
-#: actions/invite.php:145 lib/util.php:1306 lib/util.php:1731
-msgid "Send"
-msgstr ""
-
-#: ../actions/imsettings.php:71 ../actions/imsettings.php:70
-#: actions/imsettings.php:71
-msgid "Send me notices through Jabber/GTalk."
-msgstr ""
-
-#: ../lib/util.php:282 ../lib/util.php:304 lib/util.php:320
-msgid "Settings"
-msgstr ""
-
-#: ../actions/profilesettings.php:183 ../actions/profilesettings.php:192
-#: actions/profilesettings.php:307
-msgid "Settings saved."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-msgid "Someone else already has this OpenID."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-msgid "Something weird happened."
-msgstr ""
-
-#: ../lib/util.php:302 ../lib/util.php:330 lib/util.php:346
-msgid "Source"
-msgstr ""
-
-#: ../actions/showstream.php:277 ../actions/showstream.php:296
-#: actions/showstream.php:311
-msgid "Statistics"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
-#: ../actions/finishopenidlogin.php:246 actions/finishopenidlogin.php:188
-#: actions/finishopenidlogin.php:252
-msgid "Stored OpenID not found."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-msgid "Subscribe"
-msgstr ""
-
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
-#: ../actions/showstream.php:313 actions/showstream.php:328
-#: actions/subscribers.php:27
-msgid "Subscribers"
-msgstr ""
-
-#: ../actions/userauthorization.php:309 ../actions/userauthorization.php:310
-#: actions/userauthorization.php:322
-msgid "Subscription authorized"
-msgstr ""
-
-#: ../actions/userauthorization.php:319 ../actions/userauthorization.php:320
-#: actions/userauthorization.php:332
-msgid "Subscription rejected"
-msgstr ""
-
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27 ../actions/showstream.php:230
-#: ../actions/showstream.php:307 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-msgid "Subscriptions"
-msgstr ""
-
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-msgid "System error uploading file."
-msgstr ""
-
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-msgid "Text search"
-msgstr ""
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-msgid "That OpenID does not belong to you."
-msgstr ""
-
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-msgid "That address has already been confirmed."
-msgstr ""
-
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-msgid "That confirmation code is not for you!"
-msgstr ""
-
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-msgid "That file is too big."
-msgstr ""
-
-#: ../actions/imsettings.php:161 ../actions/imsettings.php:170
-#: actions/imsettings.php:178
-msgid "That is already your Jabber ID."
-msgstr ""
-
-#: ../actions/imsettings.php:224 ../actions/imsettings.php:233
-#: actions/imsettings.php:241
-msgid "That is not your Jabber ID."
-msgstr ""
-
-#: ../actions/imsettings.php:201 ../actions/emailsettings.php:226
-#: ../actions/imsettings.php:210 actions/emailsettings.php:244
-#: actions/imsettings.php:218
-msgid "That is the wrong IM address."
-msgstr ""
-
-#: ../actions/newnotice.php:52 ../actions/newnotice.php:49
-#: ../actions/twitapistatuses.php:408 actions/newnotice.php:49
-#: actions/twitapistatuses.php:330
-msgid "That's too long. Max notice size is 140 chars."
-msgstr ""
-
-#: ../actions/confirmaddress.php:86 ../actions/confirmaddress.php:92
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr ""
-
-#: ../actions/imsettings.php:241 ../actions/emailsettings.php:264
-#: ../actions/imsettings.php:250 ../actions/smssettings.php:274
-#: actions/emailsettings.php:282 actions/imsettings.php:258
-#: actions/smssettings.php:282
-msgid "The address was removed."
-msgstr ""
-
-#: ../actions/userauthorization.php:311 ../actions/userauthorization.php:312
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-
-#: ../actions/userauthorization.php:321 ../actions/userauthorization.php:322
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr ""
-
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr ""
-
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr ""
-
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr ""
-
-#: ../actions/recoverpassword.php:87 ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr ""
-
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your OpenID "
-"to a local account. You can either create a new account, or connect with "
-"your existing account, if you have one."
-msgstr ""
-
-#: ../lib/util.php:147 ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:43
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
-msgstr ""
-
-#: ../actions/profilesettings.php:51 ../actions/profilesettings.php:48
-#: ../actions/register.php:169 actions/profilesettings.php:81
-#: actions/register.php:183
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-msgid "URL of your profile on another compatible microblogging service"
-msgstr ""
-
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/smssettings.php:135 actions/emailsettings.php:144
-#: actions/imsettings.php:118 actions/recoverpassword.php:39
-#: actions/smssettings.php:143 actions/twittersettings.php:108
-msgid "Unexpected form submission."
-msgstr ""
-
-#: ../actions/recoverpassword.php:237 ../actions/recoverpassword.php:276
-#: actions/recoverpassword.php:289
-msgid "Unexpected password reset."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
-msgid "Unknown version of OMB protocol."
-msgstr ""
-
-#: ../lib/util.php:245 ../lib/util.php:269 lib/util.php:285
-msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
-msgstr ""
-
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr ""
-
-#: ../actions/showstream.php:193 ../actions/showstream.php:209
-#: actions/showstream.php:219
-msgid "Unsubscribe"
-msgstr ""
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
-#: ../actions/updateprofile.php:45 actions/postnotice.php:45
-#: actions/updateprofile.php:46
-msgid "Unsupported OMB version"
-msgstr ""
-
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-msgid "Unsupported image file format."
-msgstr ""
-
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-msgid "Upload"
-msgstr ""
-
-#: ../actions/avatar.php:27
-msgid ""
-"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
-"you upload it, so make sure it's more or less square. It must be under the "
-"site license, also. Use a picture that belongs to you and that you want to "
-"share."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
-#: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88
-msgid "User being listened to doesn't exist."
-msgstr ""
-
-#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/foaf.php:47
-#: ../actions/twitapiaccount.php:82 ../actions/twitapistatuses.php:319
-#: ../actions/twitapistatuses.php:685 ../actions/twitapiusers.php:82
-#: actions/all.php:41 actions/avatarbynickname.php:48 actions/foaf.php:47
-#: actions/replies.php:41 actions/showfavorites.php:41
-#: actions/showstream.php:44 actions/twitapiaccount.php:80
-#: actions/twitapifavorites.php:68 actions/twitapistatuses.php:235
-#: actions/twitapistatuses.php:609 actions/twitapiusers.php:87
-#: lib/mailbox.php:50
-msgid "User has no profile."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-msgid "User nickname"
-msgstr ""
-
-#: ../lib/util.php:969 ../lib/util.php:1159 lib/util.php:1293
-#, php-format
-msgid "What's up, %s?"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 ../actions/profilesettings.php:54
-#: ../actions/register.php:175 actions/profilesettings.php:87
-#: actions/register.php:189
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
-
-#: ../actions/updateprofile.php:127 ../actions/updateprofile.php:128
-#: actions/updateprofile.php:129
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:122 ../actions/updateprofile.php:123
-#: actions/updateprofile.php:124
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-msgid "You already have this OpenID!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-msgid "You are already logged in!"
-msgstr ""
-
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr ""
-
-#: ../actions/register.php:164 ../actions/register.php:135
-#: actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr ""
-
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
-msgstr ""
-
-#: ../actions/profilesettings.php:27
-msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-msgid "You can use the local subscription!"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
-#: ../actions/register.php:61 actions/finishopenidlogin.php:38
-#: actions/register.php:68
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: ../actions/updateprofile.php:62 ../actions/updateprofile.php:63
-#: actions/updateprofile.php:64
-msgid "You did not send us that profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:134 ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr ""
-
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-msgid "Your OpenID URL"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr ""
-
-#: ../actions/openidsettings.php:28
-#, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
-msgstr ""
-
-#: ../lib/util.php:814 ../lib/util.php:943 lib/util.php:992
-msgid "a few seconds ago"
-msgstr ""
-
-#: ../lib/util.php:826 ../lib/util.php:955 lib/util.php:1004
-#, php-format
-msgid "about %d days ago"
-msgstr ""
-
-#: ../lib/util.php:822 ../lib/util.php:951 lib/util.php:1000
-#, php-format
-msgid "about %d hours ago"
-msgstr ""
-
-#: ../lib/util.php:818 ../lib/util.php:947 lib/util.php:996
-#, php-format
-msgid "about %d minutes ago"
-msgstr ""
-
-#: ../lib/util.php:830 ../lib/util.php:959 lib/util.php:1008
-#, php-format
-msgid "about %d months ago"
-msgstr ""
-
-#: ../lib/util.php:824 ../lib/util.php:953 lib/util.php:1002
-msgid "about a day ago"
-msgstr ""
-
-#: ../lib/util.php:816 ../lib/util.php:945 lib/util.php:994
-msgid "about a minute ago"
-msgstr ""
-
-#: ../lib/util.php:828 ../lib/util.php:957 lib/util.php:1006
-msgid "about a month ago"
-msgstr ""
-
-#: ../lib/util.php:832 ../lib/util.php:961 lib/util.php:1010
-msgid "about a year ago"
-msgstr ""
-
-#: ../lib/util.php:820 ../lib/util.php:949 lib/util.php:998
-msgid "about an hour ago"
-msgstr ""
-
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101 ../actions/noticesearch.php:130
-#: ../actions/showstream.php:408 ../lib/stream.php:117
-#: actions/noticesearch.php:136 actions/showstream.php:426 lib/stream.php:84
-msgid "in reply to..."
-msgstr ""
-
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108 ../actions/noticesearch.php:137
-#: ../actions/showstream.php:415 ../lib/stream.php:124
-#: actions/noticesearch.php:143 actions/showstream.php:433 lib/stream.php:91
-msgid "reply"
-msgstr ""
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-msgid "same as password above"
-msgstr ""
-
-#: ../lib/util.php:1127 ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr ""
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
-msgstr ""
-
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr ""
-
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/tag.php:55 actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/invite.php:55 actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144 lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr ""
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
-msgstr ""
-
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
-msgstr ""
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
-
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96
-msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../index.php:57 index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
-msgstr ""
-
-#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
-msgstr ""
-
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
-msgstr ""
-
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
-msgstr ""
-
-#: actions/disfavor.php:72
-msgid "Favor"
-msgstr ""
-
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
-
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
-msgstr ""
-
-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
-msgstr ""
-
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr ""
-
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#, php-format
-msgid "%s favorite notices"
-msgstr ""
-
-#: actions/favoritesrss.php:64
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr ""
-
-#: actions/inbox.php:28
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr ""
-
-#: actions/inbox.php:30
-#, php-format
-msgid "Inbox for %s"
-msgstr ""
-
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
-
-#: actions/invite.php:178
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-msgstr ""
-
-#: actions/login.php:104
-msgid "Automatically login in the future; "
-msgstr ""
-
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
-msgstr ""
-
-#: actions/login.php:126
-msgid "Login with your username and password. "
-msgstr ""
-
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
-msgstr ""
-
-#: actions/newmessage.php:65
-msgid "No recipient specified."
-msgstr ""
-
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
-msgstr ""
-
-#: actions/newmessage.php:108
-msgid "No such user"
-msgstr ""
-
-#: actions/newmessage.php:117
-msgid "New message"
-msgstr ""
-
-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
-msgstr ""
-
-#: actions/openidsettings.php:28
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
-
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
-msgstr ""
-
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
-
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
-msgstr ""
-
-#: actions/outbox.php:28
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr ""
-
-#: actions/outbox.php:30
-#, php-format
-msgid "Outbox for %s"
-msgstr ""
-
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
-
-#: actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr ""
-
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
-msgstr ""
-
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
-msgstr ""
-
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
-msgstr ""
-
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
-msgstr ""
-
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
-msgstr ""
-
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
-msgstr ""
-
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
-msgstr ""
-
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
-msgstr ""
-
-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
-msgstr ""
-
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr ""
-
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr ""
-
-#: actions/remotesubscribe.php:51
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
-
-#: actions/showfavorites.php:61
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr ""
-
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
-msgstr ""
-
-#: actions/showmessage.php:33
-msgid "No such message."
-msgstr ""
-
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr ""
-
-#: actions/showmessage.php:61
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
-
-#: actions/showmessage.php:66
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr ""
-
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr ""
-
-#: actions/smssettings.php:312
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr ""
-
-#: actions/twitapidirect_messages.php:76
-#, php-format
-msgid "Direct messages to %s"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:77
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:82
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
-msgstr ""
-
-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
-#: actions/twitapifavorites.php:92
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr ""
-
-#: actions/twitapifavorites.php:95
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr ""
-
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr ""
-
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-msgstr ""
-
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr ""
-
-#: actions/twittersettings.php:41
-msgid "Twitter settings"
-msgstr ""
-
-#: actions/twittersettings.php:48
-msgid "Twitter Account"
-msgstr ""
-
-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
-msgstr ""
-
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr ""
-
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
-msgstr ""
-
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr ""
-
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
-msgstr ""
-
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
-
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
-
-#: actions/twittersettings.php:122
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
-msgstr ""
-
-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
-msgstr ""
-
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
-msgstr ""
-
-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
-msgstr ""
-
-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
-msgstr ""
-
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
-msgstr ""
-
-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
-msgstr ""
-
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
-msgstr ""
-
-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
-msgstr ""
-
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
-msgstr ""
-
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
-msgstr ""
-
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
-msgstr ""
-
-#: classes/Channel.php:113
-msgid "Command results"
-msgstr ""
-
-#: classes/Channel.php:148
-msgid "Command complete"
-msgstr ""
-
-#: classes/Channel.php:158
-msgid "Command failed"
-msgstr ""
-
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
-
-#: classes/Command.php:96
-#, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr ""
-
-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
-msgstr ""
-
-#: classes/Command.php:146
-msgid "Notice marked as fave."
-msgstr ""
-
-#: classes/Command.php:166
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr ""
-
-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
-msgstr ""
-
-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
-msgstr ""
-
-#: classes/Command.php:175
-#, php-format
-msgid "Homepage: %s"
-msgstr ""
-
-#: classes/Command.php:178
-#, php-format
-msgid "About: %s"
-msgstr ""
-
-#: classes/Command.php:200
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr ""
-
-#: classes/Command.php:214
-#, php-format
-msgid "Direct message to %s sent"
-msgstr ""
-
-#: classes/Command.php:216
-msgid "Error sending direct message."
-msgstr ""
-
-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
-
-#: classes/Command.php:270
-#, php-format
-msgid "Subscribed to %s"
-msgstr ""
-
-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
-
-#: classes/Command.php:295
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr ""
-
-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
-msgstr ""
-
-#: classes/Command.php:313
-msgid "Notification off."
-msgstr ""
-
-#: classes/Command.php:315
-msgid "Can't turn off notification."
-msgstr ""
-
-#: classes/Command.php:333
-msgid "Notification on."
-msgstr ""
-
-#: classes/Command.php:335
-msgid "Can't turn on notification."
-msgstr ""
-
-#: classes/Command.php:344
-msgid "Commands:\n"
-msgstr ""
-
-#: classes/Message.php:53
-msgid "Could not insert message."
-msgstr ""
-
-#: classes/Message.php:63
-msgid "Could not update message with new URI."
-msgstr ""
-
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr ""
-
-#: lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-msgstr ""
-
-#: lib/mail.php:249
-#, php-format
-msgid "New private message from %s"
-msgstr ""
-
-#: lib/mail.php:253
-#, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
-msgstr ""
-
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
-msgstr ""
-
-#: lib/personal.php:65
-msgid "Favorites"
-msgstr ""
-
-#: lib/personal.php:66
-#, php-format
-msgid "%s's favorite notices"
-msgstr ""
-
-#: lib/personal.php:66
-msgid "User"
-msgstr ""
-
-#: lib/personal.php:75
-msgid "Inbox"
-msgstr ""
-
-#: lib/personal.php:76
-msgid "Your incoming messages"
-msgstr ""
-
-#: lib/personal.php:80
-msgid "Outbox"
-msgstr ""
-
-#: lib/personal.php:81
-msgid "Your sent messages"
-msgstr ""
-
-#: lib/settingsaction.php:99
-msgid "Twitter"
-msgstr ""
-
-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
-msgstr ""
-
-#: lib/util.php:1718
-msgid "To"
-msgstr ""
-
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
-msgstr ""
diff --git a/plugins/BlogspamNetPlugin.php b/plugins/BlogspamNetPlugin.php
new file mode 100644
index 000000000..d9372bcd5
--- /dev/null
+++ b/plugins/BlogspamNetPlugin.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Plugin to check submitted notices with blogspam.net
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+define('BLOGSPAMNETPLUGIN_VERSION', '0.1');
+
+/**
+ * Plugin to check submitted notices with blogspam.net
+ *
+ * When new notices are saved, we check their text with blogspam.net (or
+ * a compatible service).
+ *
+ * Blogspam.net is supposed to catch blog comment spam, and I found that
+ * some of its tests (min/max size, bayesian match) gave a lot of false positives.
+ * So, I've turned those tests off by default. This may not get as many
+ * hits, but it's better than nothing.
+ *
+ * @category Plugin
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      Event
+ */
+
+class BlogspamNetPlugin extends Plugin
+{
+    var $baseUrl = 'http://test.blogspam.net:8888/';
+
+    function __construct($url=null)
+    {
+        parent::__construct();
+        if ($url) {
+            $this->baseUrl = $url;
+        }
+    }
+
+    function onStartNoticeSave($notice)
+    {
+        $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);
+        if (xmlrpc_is_fault($response)) {
+            throw new ServerException("$response[faultString] ($response[faultCode])", 500);
+        } else {
+            common_debug("Blogspamnet results = " . $response);
+            if (preg_match('/^ERROR(:(.*))?$/', $response, $match)) {
+                throw new ServerException(sprintf(_("Error from %s: %s"), $this->baseUrl, $match[2]), 500);
+            } else if (preg_match('/^SPAM(:(.*))?$/', $response, $match)) {
+                throw new ClientException(sprintf(_("Spam checker results: %s"), $match[2]), 400);
+            } else if (preg_match('/^OK$/', $response)) {
+                // don't do anything
+            } else {
+                throw new ServerException(sprintf(_("Unexpected response from %s: %s"), $this->baseUrl, $response), 500);
+            }
+        }
+        return true;
+    }
+
+    function testArgs($notice)
+    {
+        $args = array();
+        $args['comment'] = $notice->content;
+        $args['ip'] = $this->getClientIP();
+
+        if (isset($_SERVER) && array_key_exists('HTTP_USER_AGENT', $_SERVER)) {
+            $args['agent'] = $_SERVER['HTTP_USER_AGENT'];
+        }
+
+        $profile = $notice->getProfile();
+
+        if ($profile && $profile->homepage) {
+            $args['link'] = $profile->homepage;
+        }
+
+        if ($profile && $profile->fullname) {
+            $args['name'] = $profile->fullname;
+        } else {
+            $args['name'] = $profile->nickname;
+        }
+
+        $args['site'] = common_root_url();
+        $args['version'] = $this->userAgent();
+
+        $args['options'] = "max-size=140,min-size=0,min-words=0,exclude=bayasian";
+
+        return $args;
+    }
+
+    function getClientIP()
+    {
+        if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+            // Note: order matters here; use proxy-forwarded stuff first
+            foreach (array('HTTP_X_FORWARDED_FOR', 'CLIENT-IP', 'REMOTE_ADDR') as $k) {
+                if (isset($_SERVER[$k])) {
+                    return $_SERVER[$k];
+                }
+            }
+        }
+        return '127.0.0.1';
+    }
+
+    function userAgent()
+    {
+        return 'BlogspamNetPlugin/'.BLOGSPAMNETPLUGIN_VERSION . ' Laconica/' . LACONICA_VERSION;
+    }
+}
diff --git a/plugins/GoogleAnalyticsPlugin.php b/plugins/GoogleAnalyticsPlugin.php
new file mode 100644
index 000000000..1ecbb664e
--- /dev/null
+++ b/plugins/GoogleAnalyticsPlugin.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Plugin to use Google Analytics
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Plugin to use Google Analytics
+ *
+ * This plugin will spoot out the correct JavaScript spell to invoke Google Analytics on a page.
+ *
+ * Note that Google Analytics is not compatible with the Franklin Street Statement; consider using
+ * Piwik (http://www.piwik.org/) instead!
+ *
+ * @category Plugin
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      Event
+ */
+
+class GoogleAnalyticsPlugin extends Plugin
+{
+    var $code = null;
+
+    function __construct($code=null)
+    {
+        $this->code = $code;
+        parent::__construct();
+    }
+
+    function onEndShowScripts($action)
+    {
+        $js1 = 'var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");'.
+          'document.write(unescape("%3Cscript src=\'" + gaJsHost + "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));';
+        $js2 = sprintf('try{'.
+                       'var pageTracker = _gat._getTracker("%s");'.
+                       'pageTracker._trackPageview();'.
+                       '} catch(err) {}',
+                       $this->code);
+        $action->elementStart('script', array('type' => 'text/javascript'));
+        $action->raw($js1);
+        $action->elementEnd('script');
+        $action->elementStart('script', array('type' => 'text/javascript'));
+        $action->raw($js2);
+        $action->elementEnd('script');
+    }
+}
diff --git a/scripts/SearchMonkey-Om3.0.txt b/scripts/SearchMonkey-Om3.0.txt
new file mode 100644
index 000000000..45b782d0b
--- /dev/null
+++ b/scripts/SearchMonkey-Om3.0.txt
@@ -0,0 +1 @@
+BE9KrPPSJAPljm0ykS59yJQmWBFY9RPVJFhZsiF_5Wcf_tkGwf4FP2Ncjs7qGfHFCb2pv.eDr5y0zhKrF4s3ugs89DbLaA.hrbRJwglsNym5TDwDycrGw3TvjfCVmHBx4VzOZ2QzUyXBIs0T30paT6PYQfARKBdMkieKbbQ1tfl.f.ul35_kcpoXZt_lTDWFDaia2RM41uDLHJyVbCcRkqfHCLabgNeOq_MGFXGA6DjnKQx7TNyQe.2N6IyVd1quVapHn6jUOsWNkahehPMHtO72yvPpugS0UHCKBqcd.UCcbIhmtzLnKoBQAH2AJqUrmfg1XRwqFvTo6y9Z5XmDQK2hRnv97InV5he1AMIqNUotAcIrYjq5Tn42whYsznnMYhMY44UqZGoJI_ZwsSvnH6Je.AhKU3hBW9Tsmggpxgnhx_o2vhyNw2QAgPJng0FKxaevCmPnFtLntwluhxLbiTo2IiIotP4VjIVKs76hHzAsmXYuvS01OU.XB43Gmcw5yP9OUIoh5fEA1ANxOb.ba8aVxu2FdvedbOECgO6gvr.kYilrdxwwnVbHwVP6esrOiYE32dRs0_tWdgfvJfyloLjj_M5stZLEBcVfoUSQHsxX6jW5jrs4BTEHhKrxlOzdBt8f8T2E6eA9x2h7B8zK4eRtC2NBrcj1jzYCVWUT7IdbN05NZBjGYvxtmX1KRW91QwdFXgytfOINFkDk0scNCGGt4OYDzKLJ7sRBy0iKhHNfTC3noUhWf1372uXQ_yiWDWB7cTfxF9meAU3TWrTS7DjGTkwLvCVUJ43QyCxBQd1jWU6sp_VvytDeHx7cqrkNsa3JRN9dht3POqq_mVL0c5MX_XRpV8O.tPSGmfUPUrR5qnV8Z739D6PGWkOQzfzTTv6vGkf4jj1xyDEfUqr767_yL7gHeI2VlbdD2ammzwEhRK9f8ME8FbrZTTgX1OD0.v1cFULt1lew.rtCOtKf4F2MBbi90edst.TpOoUh_TvFkgKf0zgteNo2JjzrmCO.uviLCM2weGksARL70mdU6W9N932YWr6E8HbUc02S8ifSnbMpiUTHwNzMErsg7BSyRVJngGLDreBkBEIjXkNoApJR7kMPMaYVwtvjU.8wLmyFLZ.PHqqcrADTr7R50hL3UKj1mLsL19gQL3cP9J7_zJJM4Q1GDj2dPWBLhJMosUVhW8XBFPhW0aEdmgqhpsAJ_qv52xfjBeEPyPmKHu1p.1G2QEmOqFm_swbVAPHnra5zd8x4OOlHGFeL3qPLW9_LXN46chs6cOpUdYaWRzT2YuOUHHE8RDV9Mev22p7WjrbgC8hY3wK55Cpw_fCekaHcJX2jU3FPl09httjI1i5yGU04yD5MpOQF5EadbSlfjDEg8H.GoOFZcyKKDnqj_8SYdrXWq4aTqAnWgvBPh.bznvmevDgEpH.9gtzLcao4Dzmk.K0PnRgvkzyaN5IGk60TiD4Fk0u3f4bqKaPCOIKCTajbNGIasyND0J5ROtAa_IlXljCpzeEYPhSASSFV6fWmlqHFiGa2cKlLNr157MAUVQg52dJRRyid1YDcHK8ZuMc4BX8QA0olb2CDbUHKxxwv0zbIsgUTL8gvKIAPwBfF0cPfV9v6Phs1rPFXnysxdnunXnr6r6ZCN00rZeA7XbH68f.UjW0.ERGvB72kMnB8fBhfEgD22Y0ZFkwxI00UVAm5yiwkjYx86EdCpkMLBVDR1kWictX04pFLzxZK8iRflPBy74Nx2SFO19qJFnQmKEV2IN2wlrH6z14902LEI2Vuh_dVxNphr1k5mJ9x2VNGmvol.vvHmaLCufHIrOMRkAFMxeP37Mnzyk6NpxAQbdV0KwC.YTfoK9Y5knYAherlh7x8NqELX6XqutF2Lm11dikoK8Yu8u3Rkhoaef00PISV0LOb0E.D1LRjFFGzUCt5Ezcq68Tt0rFNEF1gm5Xl9Rygln_67F0KMgacpKTJ2PBIqcteyRZoRohFBRUTLkKn784KacSBsWFkogD5n7blv943wWeZFvUcKsFyYZny1WLvGEQX01kbjyaDCLDxiEQWSvlDuD.2wOra0JO5.Bo2PpPK5tbNexZDVx3k1yb48ev2UC4J4IlD6oK1KYe46Y.7NX9kDYCcdRiQOVnLJ4PSbPhDW0hcE2SNtxmFdpAf2xQOiekXY35lkuNxvebVhKuoFWxUgQmFEfreJQsC5qf_dunxGquD6u3SXnLbTg8aNWZqtR74dr3s7C5kwBK6eBGwJfkAx8Z2JKwLr5QHdISfa0wLl7aIejz5Mg_tfeATLIwW8SiIQdJiZ992Bx1k_50XQVeHOdyEc8J1Tjnkrji_ZY9PFn3AZc94wXD8erpANuJIbDIdLUp1idqF_TDtmqSK2qQgz26IkewcZnSIQnm98qxkHf9DAIbE6_GUP0ZeWqLQrn0CdhejhOPsKsovcDI7zBHMQABquMeBh9YC1.QCO9br6YmYEAV30n5IsZgl5PRiRDjkhXv8VaE.fnRNndSy7BX6kmxSmDWQfY0FvbUBWBQm7tfU3Mrk2Ojm4ALIYUZnJxl.5xj6VvD.2ZX3ug_1zo7mAiAYG_F939DMccfgCVFUcdtbF9Q9YFeC2bVMfgX5gA75nBCu5R8KopeWfTjdqZBtJoT6HxFmCSLQqIdjrxD7X2RapCI0QoDsp9xyzRZJ5NF5ygVBJqtNn2lAwFENasqFvGRSb35B.sjTQoHW5WBoBjFy5tNF1vWYJENfKRjWn5Pr0FvFdQfBKqeiWrLtStAnGrd49frviyK5VtYa.eSuRyX32SGb7.Pxo0Hf0bhER4uvPBktf3ec5UjL_xRI3eQ__F7tRiGu2tRYIUYcUkhLKAGYoDx2_gdMOXcow5W3KwtuVNtZ4UMRmuB3ccyBUzDTRWNLFISq56JXU46_v7ANub44kTLDfGuJExu.0NaOuW6isndAIYslJlcCs6NJ6j_6Ag55G.UhQFfzDKVOEt.L
\ No newline at end of file
diff --git a/scripts/SearchMonkey-yQP.0.txt b/scripts/SearchMonkey-yQP.0.txt
new file mode 100644
index 000000000..e42a04e16
--- /dev/null
+++ b/scripts/SearchMonkey-yQP.0.txt
@@ -0,0 +1 @@
+bzN6aQzSJBM8jb6JDpNRvtfEMpxOC6r2ffo5VJf0ah_Q3kXs8gwvDzGy0KGHkwDDijfnJAwhb.BIcFihUZVWe.vAy2xZZN8XUMxHwc16HwCsgDyOC9sH5WzOV0dvJcVZ.9ipAgI7RuXsAvZdJv90N89iOh1WmD6QwWyzyvnu.FjQDrQH1DlGwFs3ZNzY5lsd5uYhtJ3puBXrzSmGcR68_7OEw4QzAV9SyPSHSskXF56cpH8pUey8WiQieM4X_uuKsMjQfWEUdqNb6teXDplvPDRqHwP5rC6X1_oHBiocfgWiBfUfKOXE1g5J.JtqXYIBee8ROyx3sVIc7V2I0eotZCCiCJ1k74ru2OGC9UhX__ZESGrp9b0JZGZFO6w97IL1Y3BTgVXNox8L3FcFjl11s7YcYBhc_3e3WbJA4pZzczPzd0ouZiCjUcBCZXNu6fnM6XerBbsVj584ZbPdjQ6A5TcrED8dTcFdgfMWlMu7bHsE7e0QIJYmc2g5NWeur2ovAOPVxhELrvnJ6X6Z.06vAmwdJcl4hyYRVqA.9QynHlH2dezXS5y0eKXFUzg.tHNqZboEGutLL316mZQYvwZwATZFc8iO3EuiNV3MWbiCrLX.n3nbXp82A4v7Bv.PVJoeOTmiPmq8vuxts8nUEPf7gA3j6.DmlDvfZQNx9.WNmNFps0B08hzDMvKX98.ft9.GJlftPCYCk2qHRtWm3tjB2R9O6mF6XYvOLUK7aQ4rz5oCxHwmrF.n56G07MS5GS1pjV3ByUO88PI1i_rPbim_Up0jIO5q7PqXudyFE.nG0Dc8yaExZk7PryBfSHk2yMQVXcBjy3XQBVmrIwPwKs.YUFC1qLSThfA8UNckik2xuDZKvf29xpGvHlMbH67UV5HhY5CTeqlgvapRThmfrexqaBTTPPqR.Sy3Pvr9vHX.0UC6kNCTlxW3CExrx9EipRKUvRVClNLEG6M9hm5MQkdfgmd2Dmj5DmjcrZkWOqnNfLn_mtYdoD3nK4zCk.NZwXTFlx5FVr5bOzyncalNdb77qLEH9E9R8d2KUA4Axljx29kycILhZCvy3Qz22Vz_M72lVFKQAFnGlERRS7NLu2rB00e.MNeH9aB01uj.y9UHpfjTAwOJSFEBf7yKRCkVzqFpGAQo7txlC3NRgSyI3kQtW0WeWiNzghBv8c_5iXWkXqFyRfVZUCw2qqow3BF6SDtkhXAr8d.JrprGdG67U66ZD3JB10OLmmAaDiiCr81eVOkrsz3ONdigZOlP7RrYtodAORnheCZ10SAYbaru0sKmsJx4sB41QKn79dieWs5oihI5Rr3jUzPjfYgav5jeEfUYz5qHTtmps4vVJjt9s4zueRiT8AYzg.Xv.wdC1dvBr_kpGxwrkMEZJ0QfZkH.TDWBSWyxeG9gtuKd1gy9CGQTXlLvonJWHwK9gwWZwRKIanV4gnMfWz4pvhGixzEaiRU6g9giKYHpVKe.w0cwPfSDIhbBYqrlvuxkSTXfuFNyTpHM0Mgc6PMNnH6GooeLVK3IO2M8dRdDbL7EHykIJWe85pm5BxSqFTcWXn1nGuVWQV.F.J1XYJj1KheT725MVRlrE3sH.MgY6m4hKCUXT7mIgJ6xsfAQ8dWn7V1fCpqoIYub55iw_dg8yfZ7Yfgwj9bqN81lvTWQzBMLKYpG6pOh37JsTikpXa9kTSJfbJm0_GYZv_Bu10D1WqiO0UCvJXrlqkl5F610fkXkhwRXvmIQL2Mv_R71zSKqMr1g5RmnNifUv43jpXoOWmOKscg59pv8eOyb2JG26BtyVS2XOTDw6pHpHKuksqRKt62i1z83uv_ve5rO0zIKeMnWGlvXKHn8ld3fqGyJvqZ7wqYpnV_LTE3p73XCLEeniClXyk5Q_Icu1PgakYh3GIz8RVBjbjgrZIsvvkEp0Kgeo6oFY0wnboIwDlaUVHIue1nPkuAIsVk9i_IJWeqoRV0eO0wUGWgQ5.HT9RzcKdFVe2kl84RKuQkvoibiCfGlfTXpOfLOZtwsfl2TuNgZtP5oG1Wfsgi6g2a1N8B2WHYN8kZuG8pMnc4NQDIoO8BDnz89lDt7Y9JCslIM3O2Y25EGsylNKamKPJZr.ZSvvTVJG5sxftLxvF8vc8h5_pJD9Akj.84CjqQyfsnzFqc_.EqBaRVSy35wHHrdWTBsvjcobtSed8wXs.5En6HdubdATcgthozHWMEMsUdA29XkenPic2cR.8bQ5VdGZ2_YkJIXrxgt_XoEFFB8tgy061cghyL2fc2fHMQm4KBEc1vjkZjwRo9adWbg9dzAl782AwKC.C72bw--
\ No newline at end of file
diff --git a/scripts/decache.php b/scripts/decache.php
new file mode 100644
index 000000000..b18eaa2cd
--- /dev/null
+++ b/scripts/decache.php
@@ -0,0 +1,59 @@
+#!/usr/bin/env php
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2009, Control Yourself, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+# Abort if called from a web server
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+    print "This script must be run from the command line\n";
+    exit(1);
+}
+
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
+mb_internal_encoding('UTF-8');
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('LACONICA', true);
+
+require_once(INSTALLDIR . '/lib/common.php');
+
+if ($argc < 3 || $argc > 4) {
+    print "USAGE: decache.php <table> <id> [<column>]\n";
+    print "Clears the cache for the object in table <table> with id <id>.\n\n";
+    print "If <column> is specified, use that instead of 'id'\n";
+    exit(1);
+}
+
+$table = $argv[1];
+$id = $argv[2];
+if ($argc > 3) {
+    $column = $argv[3];
+} else {
+    $colum = 'id';
+}
+
+$object = Memcached_DataObject::staticGet($table, $column, $id);
+
+if (!$object) {
+    print "No such '$table' with $column = '$id'.\n";
+    exit(1);
+}
+
+$result = $object->decache();
diff --git a/scripts/enjitqueuehandler.php b/scripts/enjitqueuehandler.php
index 3a4f8315d..40f60da5d 100755
--- a/scripts/enjitqueuehandler.php
+++ b/scripts/enjitqueuehandler.php
@@ -74,7 +74,7 @@ class EnjitQueueHandler extends QueueHandler
         $atom .= "<link href='" . $profile->profileurl . "'/>\n";
         $atom .= "<link rel='self' type='application/rss+xml' href='" . common_local_url('userrss', array('nickname' => $profile->nickname)) . "'/>\n";
         $atom .= "<author><name>" . $profile->nickname . "</name></author>\n";
-        $atom .= "<icon>" . common_profile_avatar_url($profile, AVATAR_PROFILE_SIZE) . "</icon>\n";
+        $atom .= "<icon>" . $profile->avatarUrl(AVATAR_PROFILE_SIZE) . "</icon>\n";
         $atom .= "</source>\n";
         $atom .= "<title>" . htmlspecialchars($msg) . "</title>\n";
         $atom .= "<summary>" . htmlspecialchars($msg) . "</summary>\n";
diff --git a/scripts/facebookqueuehandler.php b/scripts/facebookqueuehandler.php
new file mode 100755
index 000000000..c6859cb21
--- /dev/null
+++ b/scripts/facebookqueuehandler.php
@@ -0,0 +1,71 @@
+#!/usr/bin/env php
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+# Abort if called from a web server
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+    print "This script must be run from the command line\n";
+    exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('LACONICA', true);
+
+require_once(INSTALLDIR . '/lib/common.php');
+require_once(INSTALLDIR . '/lib/facebookutil.php');
+require_once(INSTALLDIR . '/lib/queuehandler.php');
+
+set_error_handler('common_error_handler');
+
+class FacebookQueueHandler extends QueueHandler
+{
+    
+    function transport()
+    {
+        return 'facebook';
+    }
+    
+    function start()
+    {
+        $this->log(LOG_INFO, "INITIALIZE");
+        return true;
+    }
+
+    function handle_notice($notice)
+    {
+        return facebookBroadcastNotice($notice);
+    }
+    
+    function finish()
+    {
+    }
+
+}
+
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
+
+mb_internal_encoding('UTF-8');
+
+$id = ($argc > 1) ? $argv[1] : null;
+
+$handler = new FacebookQueueHandler($id);
+
+$handler->runOnce();
diff --git a/scripts/laconica.spec b/scripts/laconica.spec
new file mode 100644
index 000000000..5f0ed5fa9
--- /dev/null
+++ b/scripts/laconica.spec
@@ -0,0 +1,87 @@
+BuildRequires:	php-pear
+BuildRequires:	httpd-devel
+
+Name:           laconica
+Version:        0.7.2
+Release:        1%{?dist}
+License:        GAGPL v3 or later
+Source:         laconica-0.7.2.tar.gz
+Group:          Applications/Internet
+Summary:        Laconica, the Open Source microblogging platform
+BuildArch:      noarch
+
+Requires:	httpd
+Requires:	php >= 5
+Requires:	php-pear-Mail-Mime
+Requires:	php-curl
+Requires:	php-mysql
+Requires:	php-mbstring
+Requires:	php-gettext
+Requires:	php-xml
+Requires:	php-gd
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%define apache_serverroot %(/usr/sbin/apxs -q DATADIR)
+%define apache_sysconfdir %(/usr/sbin/apxs -q SYSCONFDIR)
+%define wwwpath %{apache_serverroot}/%{name}
+%define confpath %{_sysconfdir}/%{name}
+
+%description
+From the ABOUT file: Laconica (pronounced "luh-KAWN-ih-kuh") is a Free
+and Open Source microblogging platform. It helps people in a
+community, company or group to exchange short (140 character) messages
+over the Web. Users can choose which people to "follow" and receive
+only their friends' or colleagues' status messages. It provides a
+similar service to sites like Twitter, Jaiku, and Plurk. 
+
+
+%prep
+%setup -q
+
+%build
+
+
+%install
+mkdir -p %{buildroot}%{wwwpath}
+cp -a * %{buildroot}%{wwwpath}
+
+mkdir -p %{buildroot}%{_datadir}/laconica
+cp -a db %{buildroot}%{_datadir}/laconica/db
+
+mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
+cat > %{buildroot}%{_sysconfdir}/httpd/conf.d/laconica.conf <<"EOF"
+Alias /laconica/ "/var/www/laconica/"
+
+<Directory "/var/www/laconica">
+    Options Indexes FollowSymLinks
+    AllowOverride All
+    Order allow,deny
+    Allow from all
+</Directory>
+EOF
+
+%clean
+rm -rf %buildroot
+
+%files
+%defattr(-,root,root)
+%dir %{wwwpath}
+%{wwwpath}/*
+%{_datadir}/laconica/*
+%attr(-,apache,apache) %dir %{_datadir}/laconica/avatar
+%doc COPYING README doc-src/*
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/laconica.conf
+
+%changelog
+* Wed Mar 03 2009 Zach Copley <zach@controlyourself.ca> - 0.7.2
+- Changed version number to 0.7.2.
+
+* Sat Feb 28 2009 Ken Sedgwick <ken@bonsai.com> - 0.7.1-1
+- Modified RPM for Fedora.
+
+* Thu Feb 13 2009 tuukka.pasanen@ilmi.fi
+- packaged laconica version 0.7.1
+
+* Wed Feb 04 2009 tuukka.pasanen@ilmi.fi
+- packaged laconica version 0.7.0 using the buildservice spec file wizard
diff --git a/scripts/sitemap.php b/scripts/sitemap.php
index 51a9bbd75..39eb859bb 100755
--- a/scripts/sitemap.php
+++ b/scripts/sitemap.php
@@ -61,7 +61,8 @@ function standard_map()
                                     )
                               );
 
-    $docs = array('about', 'faq', 'contact', 'im', 'openid', 'openmublog', 'privacy', 'source');
+    $docs = array('about', 'faq', 'contact', 'im', 'openid', 'openmublog', 
+        'privacy', 'source', 'badge');
 
     foreach($docs as $title) {
         $standard_map_urls .= url(
diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 685bd938f..a3256966d 100755
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -23,7 +23,8 @@
 DIR=`dirname $0`
 
 for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
-         xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php; do
+         xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \
+         twitterqueuehandler.php facebookqueuehandler.php; do
 
          echo -n "Starting $f...";
 	 php $DIR/$f
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index 08e1d4714..fd4406d41 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -24,7 +24,7 @@ SDIR=`dirname $0`
 DIR=`php $SDIR/getpiddir.php`
 
 for f in jabberhandler ombhandler publichandler smshandler \
-	 xmppconfirmhandler xmppdaemon; do
+	 xmppconfirmhandler xmppdaemon twitterhandler facebookhandler ; do
 
 	FILES="$DIR/$f.*.pid"
 	for ff in "$FILES" ; do
diff --git a/scripts/twitterqueuehandler.php b/scripts/twitterqueuehandler.php
new file mode 100755
index 000000000..7da4f1e20
--- /dev/null
+++ b/scripts/twitterqueuehandler.php
@@ -0,0 +1,71 @@
+#!/usr/bin/env php
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+# Abort if called from a web server
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+    print "This script must be run from the command line\n";
+    exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('LACONICA', true);
+
+require_once(INSTALLDIR . '/lib/common.php');
+require_once(INSTALLDIR . '/lib/twitter.php');
+require_once(INSTALLDIR . '/lib/queuehandler.php');
+
+set_error_handler('common_error_handler');
+
+class TwitterQueueHandler extends QueueHandler
+{
+    
+    function transport()
+    {
+        return 'twitter';
+    }
+    
+    function start()
+    {
+        $this->log(LOG_INFO, "INITIALIZE");
+        return true;
+    }
+
+    function handle_notice($notice)
+    {
+        return broadcast_twitter($notice);
+    }
+    
+    function finish()
+    {
+    }
+
+}
+
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
+
+mb_internal_encoding('UTF-8');
+
+$id = ($argc > 1) ? $argv[1] : null;
+
+$handler = new TwitterQueueHandler($id);
+
+$handler->runOnce();
diff --git a/scripts/update_facebook.php b/scripts/update_facebook.php
deleted file mode 100755
index d2c1c3ffb..000000000
--- a/scripts/update_facebook.php
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.     If not, see <http://www.gnu.org/licenses/>.
- */
-
-# Abort if called from a web server
-if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
-    print "This script must be run from the command line\n";
-    exit();
-}
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
-
-require_once INSTALLDIR . '/lib/common.php';
-require_once INSTALLDIR . '/lib/facebookutil.php';
-
-// For storing the last run date-time
-$last_updated_file = INSTALLDIR . '/scripts/facebook_last_updated';
-
-// Lock file name
-$tmp_file = INSTALLDIR . '/scripts/update_facebook.lock';
-
-// Make sure only one copy of the script is running at a time
-if (!($tmp_file = @fopen($tmp_file, "w")))
-{
-	die("Can't open lock file. Script already running?");
-}
-
-$facebook = getFacebook();
-
-$current_time = time();
-
-$notice = getFacebookNotices(getLastUpdated());
-
-print date('r', $current_time) . " Looking for notices to send to Facebook...\n";
-
-$cnt = 0;
-
-while($notice->fetch()) {
-
-    $flink = Foreign_link::getByUserID($notice->profile_id, FACEBOOK_SERVICE);
-    $user = $flink->getUser();
-    $fbuid = $flink->foreign_id;
-    
-    if (!userCanUpdate($fbuid)) {
-        continue;
-    }
-
-    $prefix = $facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX, $fbuid);
-    $content = "$prefix $notice->content";
-    
-    if (($flink->noticesync & FOREIGN_NOTICE_SEND) == FOREIGN_NOTICE_SEND) {
-
-        // If it's not a reply, or if the user WANTS to send replies...
-        if (!preg_match('/@[a-zA-Z0-9_]{1,15}\b/u', $content) ||
-            (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY)) {
-             
-                // Avoid a Loop
-                if ($notice->source != 'Facebook') {
-                    updateStatus($fbuid, $content);
-                    updateProfileBox($facebook, $flink, $notice);
-                    $cnt++;
-                }
-            }
-    }
-}
-
-updateLastUpdated($current_time);
-
-print "Sent $cnt notices to Facebook.\n";
-
-exit(0);
-
-
-function userCanUpdate($fbuid) {
-    
-    global $facebook;
-
-    $result = false;
-    
-    try {
-        $result = $facebook->api_client->users_hasAppPermission('status_update', $fbuid);
-    } catch(FacebookRestClientException $e){
-        print_r($e);
-    }
-
-    return $result;
-}
-
-
-function updateStatus($fbuid, $content) {
-    global $facebook;
-
-    try {
-        $result = $facebook->api_client->users_setStatus($content, $fbuid, false, true);
-    } catch(FacebookRestClientException $e){
-    	print_r($e);
-    }
-}
-
-function getLastUpdated(){
-	global $last_updated_file, $current_time;
-
-	$file = fopen($last_updated_file, 'r');
-
-	if ($file) {
-	    $last = fgets($file);
-	} else {
-	    print "Unable to read $last_updated_file. Using current time.\n";
-	    return $current_time;
-	}
-
-	fclose($file);
-
-	return $last;
-}
-
-function updateLastUpdated($time){
-	global $last_updated_file;
-	$file = fopen($last_updated_file, 'w') or die("Can't open $last_updated_file for writing!");
-	fwrite($file, $time);
-	fclose($file);
-}
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 01fe8914f..ef3f8c63d 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -208,6 +208,8 @@ class XMPPDaemon extends Daemon
     {
         if (preg_match('/[\[\(]?[Aa]uto[-\s]?[Rr]e(ply|sponse)[\]\)]/', $txt)) {
             return true;
+        } else if (preg_match('/^System: Message wasn\'t delivered. Offline storage size was exceeded.$/', $txt)) {
+            return true;
         } else {
             return false;
         }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 289329bbc..c741ed4cb 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -20,16 +20,13 @@ font-family:sans-serif;
 font-size:1em;
 line-height:1.65;
 position:relative;
-margin:0 auto;
-width:71.714em;
 }
 h1,h2,h3,h4,h5,h6 {
-text-transform:uppercase;
 margin-bottom:7px;
+overflow:hidden;
 }
 h1 {
 font-size:1.4em;
-line-height:1;
 margin-bottom:18px;
 }
 h2 { font-size:1.3em; }
@@ -44,7 +41,6 @@ font-weight:bold;
 legend {
 font-weight:bold;
 font-size:1.3em;
-text-transform:uppercase;
 }
 input, textarea, select, option {
 padding:4px;
@@ -153,7 +149,8 @@ font-weight:bold;
 #form_remote_subscribe legend,
 #form_openid_login legend,
 #form_search legend,
-#form_invite legend {
+#form_invite legend,
+#form_notice_delete legend {
 display:none;
 }
 
@@ -180,6 +177,7 @@ float:left;
 width:90%;
 }
 
+
 #form_login p.form_guide,
 #form_register #settings_rememberme p.form_guide,
 #form_openid_login #settings_rememberme p.form_guide,
@@ -195,12 +193,16 @@ border-radius:4px;
 padding:0 7px;
 }
 
+
+.form_settings input.form_action-secondary {
+margin-left:29px;
+padding:0;
+}
+
 #form_search .submit {
 margin-left:11px;
 }
 
-
-
 address {
 float:left;
 margin-bottom:18px;
@@ -240,10 +242,9 @@ display:none;
 
 #site_notice {
 position:absolute;
-right:0;
-top:49px;
-float:right;
-width:300px;
+top:65px;
+right:18px;
+width:250px;
 }
 #page_notice {
 clear:both;
@@ -254,6 +255,7 @@ margin-bottom:18px;
 #anon_notice {
 float:left;
 width:432px;
+width:28.052em;
 padding:11px;
 border-radius:7px;
 -moz-border-radius:7px;
@@ -295,7 +297,7 @@ padding:4px 11px;
 border-width:1px;
 border-style:solid;
 border-bottom:0;
-text-shadow: 4px 4px 4px #ddd;
+text-shadow: 2px 2px 2px #ddd;
 font-weight:bold;
 }
 #site_nav_local_views .nav {
@@ -361,9 +363,9 @@ margin-right:4px;
 }
 
 #wrap {
-float:left;
 margin:0 auto;
-width:71.714em;
+width:1003px;
+overflow:hidden;
 }
 
 #core {
@@ -391,13 +393,15 @@ float:left;
 }
 
 #aside_primary {
-width:286px;
+width:280px;
 float:left;
-margin-left:2px;
+margin-left:4px;
 padding:18px;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
+border-width:1px;
+border-style:solid;
 }
 
 /*Start: FORM NOTICE*/
@@ -505,50 +509,44 @@ position:relative;
 width:475px;
 min-height:123px;
 float:left;
-margin-bottom:17px;
+margin-bottom:18px;
 margin-left:0;
+overflow:hidden;
 }
 .entity_profile dt,
 #entity_statistics dt {
 font-weight:bold;
 }
+.entity_profile dd {
+display:inline;
+}
+
 .entity_profile .entity_depiction {
 float:left;
-position:absolute;
-top:0;
-left:0;
 width:96px;
+margin-right:18px;
+margin-bottom:18px;
 }
+
 .entity_profile .entity_fn,
 .entity_profile .entity_nickname,
 .entity_profile .entity_location,
 .entity_profile .entity_url,
 .entity_profile .entity_note,
 .entity_profile .entity_tags {
-float:left;
-clear:left;
 margin-left:113px;
-width:322px;
 margin-bottom:4px;
+width:322px;
 }
 
 .entity_profile .entity_fn,
 .entity_profile .entity_nickname {
-width:auto;
-clear:none;
-}
-
-.entity_profile .entity_fn {
 margin-left:11px;
-margin-right:4px;
-}
-.entity_profile .entity_fn .fn {
+display:inline;
 font-weight:bold;
-font-style:normal;
 }
-.entity_profile .nickname {
-font-style:italic;
-font-weight:bold;
+.entity_profile .entity_nickname {
+margin-left:0;
 }
 
 .entity_profile .entity_fn dd:before {
@@ -566,13 +564,14 @@ display:none;
 .entity_profile h2 {
 display:none;
 }
+
 /* entity_profile */
 
 
 /*entity_actions*/
 .entity_actions {
 float:right;
-
+margin-left:28px;
 }
 .entity_actions h2 {
 display:none;
@@ -610,12 +609,14 @@ display:block;
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 .entity_send-a-message a,
+.entity_edit a,
 .form_user_nudge input.submit,
 .entity_nudge p {
 border:0;
 padding-left:20px;
 }
 
+.entity_edit a,
 .entity_send-a-message a,
 .entity_nudge p {
 padding:4px 4px 4px 23px;
@@ -688,12 +689,6 @@ min-height:60px;
 }
 
 
-.profile .form_group_join,
-.profile .form_group_leave,
-.profile .form_user_subscribe,
-.profile .form_user_unsubscribe {
-float:right;
-}
 .profile .form_group_join legend,
 .profile .form_group_leave legend,
 .profile .form_user_subscribe legend,
@@ -759,7 +754,7 @@ border-radius:4px;
 /* NOTICES */
 #notices_primary {
 float:left;
-width:644px;
+width:100%;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
@@ -776,6 +771,10 @@ padding-left:28px;
 margin-right:11px;
 }
 
+.fn {
+overflow:hidden;
+}
+
 .notice .author .fn {
 font-weight:bold;
 }
@@ -796,13 +795,11 @@ text-decoration:none;
 .vcard .url:hover {
 text-decoration:underline;
 }
-.vcard .fn {
-font-style:italic;
-}
 
 .notice .entry-title {
 float:left;
 width:100%;
+overflow:hidden;
 }
 #shownotice .notice .entry-title {
 font-size:2.2em;
@@ -903,7 +900,7 @@ left:0;
 left:29px;
 }
 .notice-options .notice_delete {
-left:76px;
+right:0;
 }
 .notice-options .notice_reply dt {
 display:none;
@@ -946,7 +943,7 @@ padding:0;
 
 
 
-#new_group {
+#new_group, #group_search {
 margin-bottom:18px;
 }
 #new_group a {
@@ -1031,21 +1028,18 @@ display:block;
 text-decoration:none;
 font-weight:bold;
 padding:7px;
-border:1px dotted #D1D9E4;
-border-bottom:0;
+border-width:1px;
+border-style:solid;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+border-radius:7px;
 }
 
 .pagination .nav_prev a {
--moz-border-radius-topright:7px;
--webkit-border-top-right-radius:7px;
-padding-left:20px;
-border-left:0;
+padding-left:30px;
 }
 .pagination .nav_next a {
--moz-border-radius-topleft:7px;
--webkit-border-top-left-radius:7px;
-padding-right:20px;
-border-right:0;
+padding-right:30px;
 }
 /* END: NOTICE */
 
@@ -1078,13 +1072,20 @@ margin-bottom:0;
 }
 
 .section .notice {
-padding-top:11px;
-padding-bottom:11px;
+padding-top:7px;
+padding-bottom:7px;
+border-top:0;
 }
 
 .section .notice:first-child {
 padding-top:0;
-border-top:0;
+}
+
+.section .notice .author {
+margin-right:0;
+}
+.section .notice .author .fn {
+display:none;
 }
 
 
@@ -1169,3 +1170,5 @@ clear:both;
 #form_settings_avatar .form_actions {
 margin-bottom:0;
 }
+
+
diff --git a/theme/base/css/facebookapp.css b/theme/base/css/facebookapp.css
index 0d8c879cd..163b41fb4 100644
--- a/theme/base/css/facebookapp.css
+++ b/theme/base/css/facebookapp.css
@@ -1,4 +1,100 @@
 @import url("display.css");
 @import url("../../identica/css/display.css");
 
-span.facebook-button { border: 2px solid #777; padding: 5px; display: block; float: left; margin-right: 20px; -moz-border-radius: 4px; border-radius:4px; -webkit-border-radius:4px; font-weight: bold; background-color:#A9BF4F; color:#fff; font-size:1.2em }
+* {
+font-size:14px;
+font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif;
+}
+
+#wrap {
+background-color:#F0F2F5;
+padding-left:18px;
+padding-right:18px;
+width:auto;
+}
+
+p,label,
+h1,h2,h3,h4,h5,h6 {
+color:#000;
+}
+
+#content {
+width:95%;
+}
+
+#site_nav_local_views a {
+background-color:#D0DFE7;
+}
+#site_nav_local_views a:hover {
+background-color:#FAFBFC;
+}
+
+span.facebook-button {
+border: 2px solid #aaa;
+padding: 3px;
+display: block;
+float: left;
+margin-right: 20px;
+-moz-border-radius: 4px; 
+border-radius:4px; 
+-webkit-border-radius:4px;
+font-weight: bold;
+background-color:#A9BF4F;
+color:#fff;
+font-size:1.2em
+}
+
+span.facebook-button a { color:#fff }
+
+.facebook_guide {
+margin-bottom:18px;
+}
+.facebook_guide p {
+font-weight:bold;
+}
+
+
+input {
+height:auto !important;
+}
+
+#facebook-friends {
+float:left;
+width:100%;
+}
+
+#facebook-friends li {
+float:left;
+margin-right:2%;
+margin-bottom:11px;
+width:18%;
+height:115px;
+}
+#facebook-friends li a {
+float:left;
+}
+
+#add_to_profile {
+position:absolute;
+right:18px;
+top:10px;
+z-index:2;
+}
+
+.notice div.entry-content dl,
+.notice div.entry-content dt, 
+.notice div.entry-content dd {
+margin-right:5px;
+}
+
+#content_inner p {
+margin-bottom:18px;
+}
+
+#content_inner ul {
+list-style-type:none;
+}
+
+.form_settings label {
+margin-right:18px;
+}
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 08b027b59..45176a201 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -9,7 +9,6 @@ margin-top:3px;
 height:16px;
 text-align:right;
 text-indent:0;
-color:#fff;
 width:24px;
 }
 
@@ -24,7 +23,3 @@ margin-left:-7px;
 .notice div.entry-content .timestamp a {
 margin-right:4px;
 }
-
-.entity_profile .entity_nickname {
-padding-right:3px;
-}
diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css
index 4a2316903..10b31cbcb 100644
--- a/theme/base/css/ie6.css
+++ b/theme/base/css/ie6.css
@@ -4,5 +4,8 @@
 .entity_profile .entity_url,
 .entity_profile .entity_note,
 .entity_profile .entity_tags {
-margin-left:55px;
+margin-left:0;
+}
+.entity_profile .entity_depiction {
+margin-bottom:123px;
 }
diff --git a/theme/base/css/ie7.css b/theme/base/css/ie7.css
deleted file mode 100644
index a6ee001e2..000000000
--- a/theme/base/css/ie7.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/* IE7 specific styles */
-
-#form_notice textarea {
-width:370px;
-}
diff --git a/theme/base/css/mobile.css b/theme/base/css/mobile.css
new file mode 100644
index 000000000..eee98317c
--- /dev/null
+++ b/theme/base/css/mobile.css
@@ -0,0 +1,150 @@
+/** theme: base
+ *
+ * @package   Laconica
+ * @author    Meitar Moscovitz <meitar@maymay.net>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+body {
+font-size:2.5em;
+}
+
+#wrap {
+width:95%;
+}
+
+#header,
+#header address,
+#anon_notice,
+#site_nav_local_views .nav,
+#form_notice,
+#form_notice .form_data li,
+#core,
+#content_inner,
+#notices_primary,
+.notice,
+.notice .entry-title,
+.notice div.entry-content,
+.notice-options,
+.notice .notice-options a,
+.pagination,
+.pagination .nav,
+.aside .section {
+float:none;
+}
+
+.notice-options .notice_reply,
+.notice-options .notice_delete,
+.notice-options .form_favor,
+.notice-options .form_disfavor {
+position:static;
+}
+
+#form_notice,
+#anon_notice,
+#footer,
+#form_notice .form_actions input.submit {
+width:auto;
+}
+
+.form_settings label {
+width:25%;
+}
+.form_settings .form_data p.form_guide {
+margin-left:26%;
+}
+
+#site_nav_global_primary {
+width:75%;
+}
+
+.entity_profile {
+width:65%;
+}
+.entity_actions {
+margin-left:0;
+}
+
+#form_notice,
+#anon_notice {
+clear:both;
+}
+
+#content,
+#aside_primary {
+width:96%;
+padding-left:2%;
+padding-right:2%;
+}
+
+#site_notice {
+position:static;
+float:right;
+clear:right;
+width:75%;
+margin-right:0;
+margin-bottom:11px;
+}
+
+.notices {
+font-size:1.5em;
+}
+
+#form_notice textarea {
+width:80%;
+height:5em;
+}
+#form_notice .form_note {
+right:20%;
+top:6em;
+}
+
+
+.vcard .photo,
+.section .vcard .photo {
+margin-right:18px;
+}
+.notice,
+.profile {
+margin-bottom:18px;
+}
+
+.notices .entry-title,
+.notices div.entry-content {
+width:90%;
+}
+.notice div.entry-content {
+margin-left:0;
+}
+
+.notice .author .photo {
+height:4.5em;
+width:4.5em;
+}
+.notice-options {
+position:absolute;
+top:0;
+right:0;
+padding-left:7%;
+width:3%;
+}
+
+.notice-options .notice_delete a {
+float:left;
+}
+.pagination .nav {
+overflow:auto;
+}
+
+#export_data {
+display:none;
+}
+
+#site_nav_local_views li {
+margin-right:4px;
+}
+#site_nav_local_views a {
+padding:18px 11px;
+}
diff --git a/theme/base/css/modal.css b/theme/base/css/modal.css
new file mode 100644
index 000000000..985e4adfa
--- /dev/null
+++ b/theme/base/css/modal.css
@@ -0,0 +1,22 @@
+/*
+ * SimpleModal Basic Modal Dialog
+ * http://www.ericmmartin.com/projects/simplemodal/
+ * http://code.google.com/p/simplemodal/
+ *
+ * Copyright (c) 2008 Eric Martin - http://ericmmartin.com
+ *
+ * Licensed under the MIT license:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *
+ * Revision: $Id: basic.css 162 2008-12-01 23:36:58Z emartin24 $
+ *
+ */
+
+
+/* Overlay */
+#simplemodal-overlay {background-color:#000; cursor:wait;}
+
+/* Container */
+#simplemodal-container {height:240px; width:320px; background-color:#fff; border:3px solid #ccc;}
+#simplemodal-container a.modalCloseImg {background:url(../images/x.png) no-repeat; width:25px; height:29px; display:inline; z-index:3200; position:absolute; top:-15px; right:-18px; cursor:pointer;}
+#simplemodal-container #basicModalContent {padding:8px;}
diff --git a/theme/base/css/modal_ie.css b/theme/base/css/modal_ie.css
new file mode 100644
index 000000000..eab4637c0
--- /dev/null
+++ b/theme/base/css/modal_ie.css
@@ -0,0 +1,16 @@
+/*
+ * SimpleModal Basic Modal Dialog
+ * http://www.ericmmartin.com/projects/simplemodal/
+ * http://code.google.com/p/simplemodal/
+ *
+ * Copyright (c) 2008 Eric Martin - http://ericmmartin.com
+ *
+ * Licensed under the MIT license:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *
+ * Revision: $Id: basic_ie.css 162 2008-12-01 23:36:58Z emartin24 $
+ *
+ */
+
+/* IE 6 hacks*/
+#simplemodal-container a.modalCloseImg {background:none; right:-14px; width:22px; height:26px; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/x.png',sizingMethod='scale');}
diff --git a/theme/base/css/print.css b/theme/base/css/print.css
new file mode 100644
index 000000000..2da3e5e44
--- /dev/null
+++ b/theme/base/css/print.css
@@ -0,0 +1,36 @@
+/** theme: base
+ *
+ * @package   Laconica
+ * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+a:after { background-color:#fff; }
+a:not([href^="#"]):after { content:" ( "attr(href)" ) "; }
+
+img { border:none; }
+p { orphans: 2; widows: 1; }
+
+#site_nav_global_primary,
+#site_nav_local_views,
+#form_notice,
+.pagination,
+#site_nav_global_secondary,
+.entity_actions,
+.notice-options,
+#aside_primary,
+.form_subcription_edit .submit {
+display:none;
+}
+
+.timestamp dt, .timestamp dd,
+.device dt, .device dd {
+display:inline;
+}
+
+.profiles li,
+.notices li {
+margin-bottom:18px;
+}
diff --git a/theme/base/images/icons/icon_atom.jpg b/theme/base/images/icons/icon_atom.jpg
deleted file mode 100644
index 22853edc4..000000000
--- a/theme/base/images/icons/icon_atom.jpg
+++ /dev/null
diff --git a/theme/base/images/icons/icon_atom.png b/theme/base/images/icons/icon_atom.png
new file mode 100644
index 000000000..6a001f11a
--- /dev/null
+++ b/theme/base/images/icons/icon_atom.png
diff --git a/theme/base/images/icons/icon_rss.jpg b/theme/base/images/icons/icon_rss.jpg
deleted file mode 100644
index da23422d0..000000000
--- a/theme/base/images/icons/icon_rss.jpg
+++ /dev/null
diff --git a/theme/base/images/icons/icon_rss.png b/theme/base/images/icons/icon_rss.png
new file mode 100644
index 000000000..0ccd1ce25
--- /dev/null
+++ b/theme/base/images/icons/icon_rss.png
diff --git a/theme/base/images/x.png b/theme/base/images/x.png
new file mode 100644
index 000000000..c11f7af69
--- /dev/null
+++ b/theme/base/images/x.png
diff --git a/theme/default/bg-body.gif b/theme/default/bg-body.gif
deleted file mode 100644
index 5e1afa048..000000000
--- a/theme/default/bg-body.gif
+++ /dev/null
diff --git a/theme/default/bg-header.gif b/theme/default/bg-header.gif
deleted file mode 100644
index a34b9b34f..000000000
--- a/theme/default/bg-header.gif
+++ /dev/null
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index fb25d32d0..85b5aa13e 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -34,6 +34,9 @@ border-color:#aaa;
 border-color:#97BFD1;
 }
 
+.form_settings input.form_action-secondary {
+background:none;
+}
 
 input.submit,
 #form_notice.warning #notice_text-count,
@@ -59,7 +62,8 @@ div.notice-options input,
 .form_user_unblock input.submit,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
-.entity_nudge p {
+.entity_nudge p,
+.form_settings input.form_action-secondary {
 color:#002E6E;
 }
 
@@ -67,7 +71,6 @@ color:#002E6E;
 .profile {
 border-top-color:#D1D9E4;
 }
-.section .notice,
 .section .profile {
 border-top-color:#97BFD1;
 }
@@ -92,12 +95,6 @@ color:#333;
 color:#000;
 }
 
-#form_notice #notice_data-attach_view {
-background-image:url(../images/icons/twotone/green/paper-clip.gif);
-background-repeat:no-repeat;
-background-position:0 45%;
-background-color:transparent;
-}
 
 #nav_register a {
 text-decoration:none;
@@ -106,7 +103,8 @@ padding:2px 4px;
 }
 
 #content,
-#site_nav_local_views a {
+#site_nav_local_views a,
+#aside_primary {
 border-color:#fff;
 }
 #content,
@@ -122,8 +120,6 @@ background-color:rgba(255, 255, 255, 0.7);
 }
 
 
-
-
 #page_notice .error {
 background-color:#F7E8E8;
 }
@@ -143,26 +139,21 @@ background-color:#A9BF4F;
 }
 
 
-
-
 #export_data li a {
 background-repeat:no-repeat;
 background-position:0 45%;
 }
 #export_data li a.rss {
-background-image:url(../../base/images/icons/icon_rss.jpg);
+background-image:url(../../base/images/icons/icon_rss.png);
 }
 #export_data li a.atom {
-background-image:url(../../base/images/icons/icon_atom.jpg);
+background-image:url(../../base/images/icons/icon_atom.png);
 }
 #export_data li a.foaf {
 background-image:url(../../base/images/icons/icon_foaf.gif);
 }
-#export_data li a.export_vcard {
-background-image:url(../../base/images/icons/icon_vcard.gif);
-}
-
 
+.entity_edit a,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
 .form_user_block input.submit,
@@ -184,6 +175,9 @@ color:#fff;
 background-color:#97BFD1;
 }
 
+.entity_edit a {
+background-image:url(../images/icons/twotone/green/edit.gif);
+}
 .entity_send-a-message a {
 background-image:url(../images/icons/twotone/green/quote.gif);
 }
@@ -203,30 +197,6 @@ background-image:url(../images/icons/twotone/green/shield.gif);
 background-color:#fcfcfc;
 }
 
-.notice-data a span {
-background-color:transparent;
-background-repeat:no-repeat;
-background-position:0 45%;
-}
-.notice_video .notice-data a span {
-background-image:url(../images/icons/twotone/green/camera.gif);
-}
-.notice_audio .notice-data a span {
-background-image:url(../images/icons/twotone/green/music.gif);
-}
-.notice_image .notice-data a span {
-background-image:url(../images/icons/twotone/green/search.gif);
-}
-.notice_event .notice-data a span {
-background-image:url(../images/icons/twotone/green/calendar.gif);
-}
-.notice_location .notice-data a span {
-background-image:url(../images/icons/twotone/green/flag.gif);
-}
-.notice_document .notice-data a span {
-background-image:url(../images/icons/twotone/green/document.gif);
-}
-
 .notice-options .notice_reply a,
 .notice-options form input.submit {
 background-color:transparent;
@@ -268,17 +238,21 @@ background-color:#fcfcfc;
 #new_group a {
 background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
 }
-
+#usergroups #new_group {
+float: left;
+margin-right: 2em;
+}
 
 .pagination .nav_prev a,
 .pagination .nav_next a {
 background-repeat:no-repeat;
+border-color:#D1D9E4;
 }
 .pagination .nav_prev a {
 background-image:url(../images/icons/twotone/green/arrow-left.gif);
-background-position:0 45%;
+background-position:10% 45%;
 }
 .pagination .nav_next a {
 background-image:url(../images/icons/twotone/green/arrow-right.gif);
-background-position:100% 45%;
+background-position:90% 45%;
 }
diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css
new file mode 100644
index 000000000..2b06768ea
--- /dev/null
+++ b/theme/default/css/ie.css
@@ -0,0 +1,9 @@
+/* IE specific styles */
+
+.notice-options input.submit {
+color:#fff;
+}
+
+#site_nav_local_views a {
+background-color:#ACCCDA;
+}
diff --git a/theme/default/display.css b/theme/default/display.css
deleted file mode 100644
index f22f9aa69..000000000
--- a/theme/default/display.css
+++ /dev/null
@@ -1,1107 +0,0 @@
-/* CSS Document */
-/* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */
-
-html {
-	background-color: #f6e5b0;
-	}
-body {
-	position: absolute;
-	width: 100%;
-	margin: 0;
-	padding: 0;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	line-height: 12px;
-	min-height: 100%;
-	height: 100%;
-    color: #701238;
-	}
-a {
-	color: #d1451a;
-	text-decoration: none;
-	}
-a:hover {
-	text-decoration: underline;
-	}
-img, img a {
-	border: 0;
-	}
-h1 {
-	font-size: 14px;
-	}
-
-#wrap {
-	margin: 0 auto;
-	padding: 0 20px;
-	width: 760px;
-	background: url(bg-header.gif) repeat-x #fbf2d7;
-	}
-#header {
-	position: relative;
-	margin: 0 auto;
-	width: 600px;
-	height: 216px;
-	}
-#logo {
-	margin-top: 9px;
-	}
-p#branding {
-	margin: 0;
-	padding: 6px 0 3px 0;
-	color: #fbf2d7;
-	font-size: 21px;
-	font-weight: bold;
-	line-height: 27px;
-	}
-p#branding a {
-	color: #dab134;
-	}
-
-#header h1.pagetitle {
-	margin: 0;
-	padding: 0;
-	font-size: 15px;
-	line-height: 24px;
-	color: #fff6d5;
-}
-
-#header h2.sitename {
-	display: none;
-	margin: 0;
-	padding: 0;
-	color: #fff6d5;
-}
-
-abbr.published { border-bottom:0; }
-
-/* ===== Begin Navigation Styling ===== */
-
-/* ----- Navigation ------ */
-#nav {
-	float: right;
-	margin: 0;
-	padding: 0;
-	list-style-type: none;
-	font-size: 12px;
-	}
-#nav li {
-	display: block;
-	float: left;
-	}
-#nav li a {
-	display: block;
-	padding: 9px 9px 12px 9px;
-	color: #F60;
-	}
-#nav li a:hover {
-	text-decoration: underline;
-	}
-
-/* ----- Tabs ----- */
-#nav_views {
-	margin: 0 auto;
-	padding: 0;
-	position: absolute;
-	bottom: 0;
-	list-style-type: none;
-	font-size: 14px;
-	font-weight: bold;
-	width: 600px;
-	/*height: 30px;*/
-	}
-#nav_views li {
-	display: block;
-	float: left;
-	line-height: 21px;
-	}
-#nav_views li a {
-	display: block;
-	margin: 0;
-	padding: 4px 12px 3px 12px;
-	color: #fff6d5;
-	background-color: #d1451a;
-	border-right: 1px solid #dcaa3f;
-	}
-#nav_views li a:hover {
-	text-decoration: none;
-	}
-#nav_views li.current a, #nav_views li.current a:hover {
-	color: #701238;
-	background-color: #fff6d5;
-	border-right: 1px solid #dcaa3f;
-	}
-#nav_views li.current a:hover {
-	color: #d1451a;
-	}
-#nav_views li a:hover {
-	color: #fff6d5;
-	background-color: #701238;
-	border-right: 1px solid #dcaa3f;
-	}
-
-.feeds {
-clear:both;
-float:right;
-margin-top:1.25em;
-position:absolute;
-right:0;
-bottom:-30px;
-}
-.feeds * {
-line-height:1.4;
-padding:0;
-margin:0;
-font-size:12px;
-}
-
-.feeds p {
-font-weight:bold;
-display:inline;
-display:none;
-}
-.feeds ul {
-display:inline;
-}
-.feeds li {
-list-style-type:none;
-display:inline;
-margin-left:0.5em;
-}
-.feeds li a.rss,
-.feeds li a.atom {
-background:url(icon_feed.jpg) no-repeat;
-padding-top:2px;
-padding-left:20px;
-}
-.feeds li a.foaf {
-background:url(icon_foaf.gif) no-repeat;
-padding-top:2px;
-padding-left:30px;
-}
-
-form#disfavor, form.disfavor,
-form#favor, form.favor  {
-	float: right;
-}
-
-/*favorites*/
-input#favor, input.favor,
-input#disfavor, input.disfavor  {
-	background-color:#fcfff5;
-	background-color:transparent;
-	background-image:url(icon_heart-02.gif);
-	background-repeat:no-repeat;
-	cursor: pointer;
-	border: 0;
-	width: 16px;
-	height:16px;
-	text-indent:-9999px;
-}
-
-input#disfavor, input.disfavor {
-	background-image:url(icon_heart-01.gif);
-}
-
-.notice_single:hover input.favor,
-.notice_single:hover input.disfavor {
-	background-color:#f3f8ea;
-}
-
-/*profile_actions*/
-#profile_actions {
-padding-left:0;
-list-style-type:none;
-margin:0;
-}
-#profile_actions li {
-margin-bottom:0.5em;
-clear:both;
-}
-
-#profile_actions #profile_nudge input.submit,
-#profile_actions #profile_block input.submit,
-.profile_single form.block input.submit {
-margin:0 0 0 -3px;
-padding:0;
-background-color:transparent;
-color:#C15D42;
-font-family:Georgia,"Times New Roman",Times,serif;
-font-weight:normal;
-font-size:14px;
-text-align:left;
-float:left;
-line-height:18px;
-}
-#profile_actions #profile_nudge input.submit:hover,
-#profile_actions #profile_block input.submit:hover {
-background-color:transparent;
-color:#C15D42;
-}
-
-#wrap p#nudge_response {
-background-color:transparent;
-line-height:18px;
-font-size:14px;
-}
-#wrap #profile_nudge input.disabled {
-color:#999;
-cursor:default;
-}
-
-
-#wrap form input.disabled,
-#wrap form input.disabled:hover {
-background-color:#999;
-cursor:default;
-}
-
-/* ----- Nav Footer ----- */
-#nav_sub {
-	clear: both;
-	margin: 18px auto 0 auto;
-	padding: 0;
-	list-style-type: none;
-	font-size: 11px;
-	font-weight: bold;
-	line-height: 21px;
-	border-top: 1px solid #dec5b5;
-	width: 600px;
-	}
-#nav_sub li {
-	display: block;
-	float: left;
-	}
-#nav_sub li a {
-	padding: 6px 24px 6px 0;
-	}
-#nav_sub li a:hover {
-	text-decoration: underline;
-	}
-/* ===== End Navigation Styling ===== */
-
-#content {
-	clear: left;
-	margin: 40px 0 45px 0;
-	padding: 0 80px;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 14px;
-	line-height: 18px;
-	}
-#content h2 {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 15px;
-	}
-#content label {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	}
-.instructions p, .success, .error {
-	font-weight: normal;
-	margin: 36px 0 0 0;
-	padding: 10px;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 13px;
-	line-height: 15px;
-	border: 1px solid #dec5b5;
-	color: #fff6d5;
-	}
-.instructions a, .success a, .error a {
-	color: #d8e2d7;
-	text-decoration: underline;
-	}
-.instructions a:hover, .success a:hover, .error a:hover {
-	color: #fff6d5;
-	}
-.success {
-	background-color: #48705b;
-	}
-.error {
-	background-color: #ce3728;
-	}
-
-/* ----- Stream -----*/
-
-#notices {
-	clear: both;
-	margin: 0 auto;
-	padding: 0;
-	list-style-type: none;
-	width: 600px;
-	border-top: 1px solid #dec5b5;
-	}
-#notices a:hover {
-	text-decoration: underline;
-	}
-.notice_single {
-	clear: both;
-	display: block;
-	margin: 0;
-	padding: 5px 5px 5px 0;
-	min-height: 48px;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 13px;
-	line-height: 16px;
-	border-bottom: 1px solid #dec5b5;
-	background-color:#FCFFF5;
-	opacity:1;
-	}
-.notice_single:hover {
-	background-color: #f7ebcc;
-	}
-.notice_single p {
-	display: inline;
-	margin: 0;
-	padding: 0;
-	}
-#notice_delete_form #confirmation_text {
-    display: block;
-	font-size: 14px;
-	font-weight: bold;
-	}
-
-input#submit_yes, input#submit_no {
-	margin: 18px 10px 0px 0px;
-	padding: 4px;
-	font-weight: bold;
-	color: #fff6d5;
-	background-color: #F60;
-	cursor: pointer;
-	border: 0;
-	width: 40px;
-	}
-input#submit_yes:hover, input#submit_no:hover {
-	background-color: #701238;
-	}
-.avatar.stream {
-	float: left;
-	margin: 0 10px 0.5em 0;
-	}
-p.time {
-	display: block;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	line-height: 15px;
-	}
-p.time a {
-	color: #dab134;
-	}
-
-/* ----- Profile -----*/
-#profile {
-	clear: left;
-	margin: 0 -80px;
-	padding: 10px 0 0 0;
-	min-height: 170px;
-	border-top: 1px solid #dec5b5;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	margin-bottom:1em;
-	float:left;
-	width:750px;
-	}
-#profile h1 {
-	margin: 0;
-	padding: 0;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	}
-#profile h2 {
-	margin: 0;
-	padding: 0;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	text-transform: uppercase;
-	color: #dab134;
-	}
-#profile p {
-	margin: 0 10px 0 0;
-	font-size: 12px;
-	line-height: 14px;
-	}
-#profile p.location {
-	margin: 0 10px 12px 0;
-	font-style: italic;
-	}
-#profile p.notice_current {
-	font-size: 18px;
-	line-height: 21px;
-	}
-#profile_avatar {
-	float: left;
-	margin-right: 4px;
-	}
-#profile_avatar img {
-	margin-bottom: 5px;
-	}
-.avatar.profile {
-	clear: left;
-	margin: 0 10px 5px 0;
-	}
-.avatar.original {
-	float: left;
-	margin: 0 10px 18px 0;
-	}
-
-#profilesettings {
-	margin-bottom:2em;
-}
-
-
-.avatar_view {
-	float:left;
-	margin-bottom:1em;
-	margin-right:1em;
-}
-
-#avatar_preview_view {
-	overflow:hidden;
-	width:96px;
-	height:96px;
-}
-#avatar_crop {
-	margin-bottom:2em;
-}
-
-#avatar_crop,
-#avatarfile {
-	clear:both;
-}
-
-a.nickname {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	font-size: 12px;
-	padding-right: 3px;
-	}
-.hentry a.nickname {
-	font-weight:normal;
-}
-#profile_information {
-	float: left;
-	position: relative;
-	width: 270px;
-	}
-.statistics {
-	margin-top: 18px;
-	}
-.statistics h2 {
-	margin: 12px 0 3px 0;
-	}
-dl.statistics {
-	margin: 0;
-	font-size: 12px;
-	line-height: 14px;
-	}
-.statistics dt {
-	float: left;
-	width: 96px;
-}
-.statistics dd {
-	margin-left: 100px;
-}
-.statistics dt:after {
-	content: ":";
-	}
-#subscriptions {
-	float: left;
-	margin: 18px 0 30px 0;
-	}
-#subscriptions_avatars {
-	float: left;
-	margin: 6px 0 0 0;
-	padding: 0;
-	list-style-type: none;
-	width: 270px;
-	}
-#subscriptions_avatars li .avatar.mini {
-	float: left;
-	margin: 0 3px 3px 0;
-	padding: 0;
-	line-height: 0;
-	/* border: 1px solid #f00; */
-	}
-#subscriptions_viewall {
-	clear: left;
-	}
-/* ----- End Profile -----*/
-
-/* ----- Begin Subscriptions & Subscribers -----*/
-
-ul.subscriptions, ul.subscribers {
-	float: none;
-	margin: 0;
-	padding: 0;
-	list-style-type: none;
-	overflow: auto;
-	clear:both;
-	}
-ul.subscriptions li, ul.subscribers li {
-	display: block;
-	float: left;
-	padding: 0;
-	}
-/* ----- End Subscriptions & Subscribers -----*/
-
-#pagination {
-	margin: 18px auto;
-	width: 600px;
-	}
-#nav_pagination {
-	margin: 0 0 36px 0;
-	padding: 0;
-	float: right;
-	list-style-type: none;
-	font-size: 12px;
-	font-weight: bold;
-	}
-#nav_pagination li {
-	display: block;
-	float: left;
-	background-color: #701238;
-	}
-#nav_pagination li.before {
-	margin-right: 1px;
-	}
-#nav_pagination li a {
-	padding: 6px 15px;
-	line-height: 21px;
-	background-color: #701238;
-	color: #fff6d5;
-	}
-#nav_pagination li a:hover {
-	background-color: #3F606F;
-	color: #fff6d5;
-	text-decoration: none;
-	}
-
-#footer {
-	clear: both;
-	margin: 0 auto;
-	padding: 0 0 36px 0;
-	width: 600px;
-	border-top: 1px solid #dec5b5;
-	}
-#footer p {
-	margin-top: 9px;
-	line-height: 12px;
-	}
-#cc {
-	float: left;
-	margin: 3px 10px 0 0;
-	}
-
-/* ===== Begin Forms Styling ===== */
-
-/* ----- Forms General Style ----- */
-form {
-	margin: 0 auto;
-	padding: 0;
-	}
-form {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	}
-form label {
-	display: block;
-	font-size: 12px;
-	font-weight: bold;
-	line-height: 18px;
-	}
-form input {
-	border: 1px solid #dec5b5;
-	width: 264px;
-	}
-input#submit, input.submit  {
-	display: block;
-	margin: 18px 0;
-	padding: 4px;
-	font-weight: bold;
-	color: #fff6d5;
-	background-color: #F60;
-	cursor: pointer;
-	border: 0;
-	width: auto;
-	}
-input#submit:hover, input.submit:hover {
-	background-color: #701238;
-	}
-input.checkbox {
-	/*width: 14px;
-	height: 14px;*/
-	width: auto;
-	border: 0;
-	}
-
-label.checkbox_label {
-    display: inline;
-    font-weight: normal;
-}
-
-textarea, input {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #701238;
-	padding: 3px;
-	}
-textarea:focus, input:focus {
-	background-color: #f8ebc0;
-	}
-textarea {
-	width: 270px;
-	border: 1px solid #D8E2D7;
-	}
-.input_instructions {
-	margin-top: 3px;
-	display: block;
-	font-size: 11px;
-	line-height: 15px;
-	color: #924959;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	}
-
-/* ----- Status Form ----- */
-#status_form {
-	height: 96px;
-	/*background-color: #F00;*/
-	}
-#status_form p {
-	margin: 36px 0 0 0;
-	padding: 0;
-	}
-#status_label {
-	display: block;
-	clear: both;
-	margin: 0;
-	padding: 0 0 3px 0;
-	font-size: 18px;
-	font-weight: bold;
-	line-height: 24px;
-	color: #dab134;
-	}
-#status_textarea {
-	display: block;
-	float: left;
-	width: 463px;
-	height: 35px;
-	padding: 5px;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #701238;
-	border: 0;
-	}
-#status_submit {
-	display: block;
-	float: left;
-	margin: 1px 0 0 4px;
-	width: 63px;
-	height: 45px;
-	background-color: #F60;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	font-size: 14px;
-	color: #fff6d5;
-	cursor: pointer;
-	border: 0;
-	}
-#status_submit:hover {
-	background-color: #d1451a;
-	}
-#counter {
-	position: absolute;
-	top: 140px;
-	left: -64px;
-	width: 50px;
-	font-weight: bold;
-	text-align: right;
-}
-.response_error textarea,
-.response_error .on_max {
-background-color:#fee;
-}
-
-/* ----- Subscribe Form ----- */
-#content .subscribe .submit, #content .unsubscribe .submit, #remotesubscribe .button, #remotesubscribe {
-	clear: left;
-	margin: 0;
-	width: 96px;
-	height: 27px;
-	font-family: verdana, arial, helvetica, sans-serif;
-	font-weight: bold;
-	font-size: 10px;
-	text-transform: uppercase;
-	background-color: #F60;
-	color: #fff6d5;
-	border: 0;
-	}
-#remotesubscribe {
-	width: 96px;
-	height: 22px;
-	padding: 5px 0 0 0;
-	text-align: center;
-	}
-#content .subscribe .button:hover, #content .unsubscribe .button:hover {
-	background-color: #904632;
-	cursor: pointer;
-	}
-
-a#remotesubscribe {
-	display: block;
-}
-
-/* ----- Login Form -----*/
-input#license {
-	width: auto;
-	border: 0;
-	}
-/* ----- Avatar Form -----*/
-form {
-	clear: left;
-}
-
-/* ----- OpenID Form -----*/
-
-input#openid_url {
-   background: url(login-bg.gif) no-repeat;
-   background-color: #fff;
-   background-position: 4px 50%;
-   color: #000;
-   padding-left: 24px;
-}
-
-/* People lists (search results, maybe subscribers) */
-
-#profiles {
-	clear: both;
-	margin: 0 auto;
-	padding: 0;
-	list-style-type: none;
-	width: 600px;
-	border-top: 1px solid #dec5b5;
-	/*border: 1px solid #F00;*/
-	}
-#profiles a:hover {
-	text-decoration: underline;
-	}
-
-.profile_single {
-	clear: both;
-	display: block;
-	margin: 0;
-	padding: 5px 5px 5px 0;
-	min-height: 48px;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 13px;
-	line-height: 16px;
-	border-bottom: 1px solid #dec5b5;
-	width:100%;
-	float:left;
-	}
-.profile_single:hover {
-	background-color: #f7ebcc;
-	}
-
-.profile_single form.block,
-.profile_single form.subscribe,
-.profile_single form.unsubscribe {
-	float: right;
-}
-
-form.subedit {
-	margin-left:4.5em;
-}
-form.subedit p {
-	display:inline;
-
-}
-form.subedit input.submit {
-	margin:0 0 0 0.5em;
-	display:inline;
-	background-color:transparent;
-	padding:0;
-	color:#C15D42;
-	border:1px solid #C15D42;
-}
-
-
-
-/* ----- IM Settings Form -----*/
-
-#imsettings p {
-	margin: 0;
-	padding: 0;
-	line-height: 15px;
-}
-
-/* ----- direct message ----- */
-
-#message_form {
-	height: 96px;
-	/*background-color: #F00;*/
-	}
-
-#message_form p {
-	margin: 21px 0 0 0;
-	padding: 0;
-	}
-#message_form label {
-	display: inline;
-	}
-
-#message_content {
-	display: block;
-	float: left;
-	width: 463px;
-	height: 35px;
-	padding: 5px;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #193441;
-	border: 0;
-	}
-
-#message_send {
-	display: block;
-	float: left;
-	margin: 1px 0 0 4px;
-	width: 63px;
-	height: 45px;
-	background-color: #C15D42;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	font-size: 14px;
-	color: #FCFFF5;
-	cursor: pointer;
-	border: 0;
-	}
-
-#message_send:hover {
-	background-color: #904632;
-	}
-
-/* ===== End Forms Styling ===== */
-
-/* ===== Tag Cloud Styling ===== */
-
-p.tagcloud {
-text-align: center;
-}
-
-p.tagcloud a {
-line-height:100%;
-vertical-align:middle;
-}
-
-p.tagcloud a.largest {
-font-size: 400%;
-}
-p.tagcloud a.verylarge {
-font-size: 300%;
-}
-
-p.tagcloud a.large {
-font-size: 200%;
-}
-
-p.tagcloud a.medium {
-font-size: 150%;
-}
-
-p.tagcloud a.small {
-font-size: 100%;
-}
-
-p.tagcloud a.verysmall {
-font-size: 80%;
-}
-
-p.tagcloud a.smallest {
-font-size: 60%;
-}
-
-#subscriptions_nav,
-#filter_tags {
-margin:0 0 2em 0;
-}
-
-#subscriptions_nav {
-padding-bottom:0.5em;
-/*border-bottom:1px solid #D8E2D7;*/
-float:right;
-}
-#filter_tags {
-float:left;
-}
-
-#subscriptions_nav dt,
-#filter_tags dt {
-display:none;
-}
-#subscriptions_nav dd,
-#filter_tags dd {
-margin-left:0;
-}
-#subscriptions_nav ul,
-#filter_tags ul {
-padding-left:0;
-list-style-type:none;
-margin-left:0;
-}
-#subscriptions_nav ul li {
-display:inline;
-padding-left:0.5em;
-margin-left:0.5em;
-border-left:1px solid #D8E2D7;;
-}
-#subscriptions_nav ul li.child_1 {
-border-left:0;
-padding-left:0;
-margin-left:0;
-}
-
-#filter_tags ul li {
-float:left;
-margin-left:0.5em;
-padding-left:0.5em;
-border-left:1px solid #D8E2D7;;
-}
-#filter_tags ul li.child_1 {
-margin-left:0;
-border-left:0;
-padding-left:0;
-}
-#filter_tags ul li li {
-margin-left:0;
-}
-#filter_tags ul li#filter_tags_item {
-width:30em;
-}
-#filter_tags ul li#filter_tags_item form {
-clear:none;
-}
-#filter_tags ul li#filter_tags_item label {
-margin-right:0.5em;
-font-size:14px;
-font-weight:normal;
-font-family:Georgia,"Times New Roman",Times,serif;
-}
-#filter_tags ul li#filter_tags_item label,
-#filter_tags ul li#filter_tags_item select {
-margin-top:-1px;
-margin-bottom:0.5em;
-display:inline;
-}
-#filter_tags ul li#filter_tags_item p {
-margin:0 1em 0 0;
-padding:0;
-float:left;
-}
-#filter_tags ul li .input_instructions {
-display:inline;
-display:block;
-margin:0;
-}
-#filter_tags ul li#filter_tags_item .submit {
-margin:0;
-}
-
-.tags_self,
-.tags_user {
-margin-left:4.5em;
-}
-.tags_self dl,
-.tags_user dl {
-margin-left:0;
-}
-
-.tags_self dt,
-.tags_user dt {
-display:inline;
-margin-right:0.5em;
-}
-
-.tags_self dd,
-.tags_user dd {
-margin-left:0;
-display:inline;
-}
-
-ul.tags {
-padding-left:0;
-margin-left:0;
-list-style-type:none;
-display:inline;
-}
-ul.tags li {
-display:inline;
-margin-right:0.75em;
-}
-ul.tags li a {
-padding-left:17px;
-background:url(icon_tag-01.gif) no-repeat;
-line-height:1.5;
-}
-
-.tags_user {
-margin-bottom:0.5em;
-}
-
-form#tag_user {
-margin-left:8.75em;
-clear:both;
-}
-form#tag_user p {
-margin:0;
-}
-
-form#tag_user label {
-display:inline;
-margin-right:1em;
-}
-form#tag_user .submit {
-margin-left:4em;
-}
-
-form#tag_user .input_instructions {
-margin-left:4.5em;
-}
-
-.profile_list p {
-margin:0 0 0.5em 0;
-}
-
-.profile_list .bio {
-margin-left:4.5em;
-}
-
-/* ----- Mailbox ----- */
-#messages {
-	clear: both;
-	margin: 0 auto;
-	padding: 0;
-	list-style-type: none;
-	width: 600px;
-	border-top: 1px solid #dec5b5;
-	}
-
-#messages a:hover {
-        text-decoration: underline;
-	}
-
-.message_single {
-	clear: both;
-	display: block;
-	margin: 0;
-	padding: 5px 5px 5px 0;
-	min-height: 48px;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 13px;
-	line-height: 16px;
-	border-bottom: 1px solid #dec5b5;
-	}
-.message_single:hover {
-	background-color: #f7ebcc;
-	}
-.message_single p {
-	display: inline;
-	margin: 0;
-	padding: 0;
-	}
diff --git a/theme/default/icon_feed.jpg b/theme/default/icon_feed.jpg
deleted file mode 100644
index 53c4d4959..000000000
--- a/theme/default/icon_feed.jpg
+++ /dev/null
diff --git a/theme/default/icon_foaf.gif b/theme/default/icon_foaf.gif
deleted file mode 100644
index f8f784423..000000000
--- a/theme/default/icon_foaf.gif
+++ /dev/null
diff --git a/theme/default/icon_heart-01.gif b/theme/default/icon_heart-01.gif
deleted file mode 100644
index bdfd7483f..000000000
--- a/theme/default/icon_heart-01.gif
+++ /dev/null
diff --git a/theme/default/icon_heart-02.gif b/theme/default/icon_heart-02.gif
deleted file mode 100644
index cbb35e0dc..000000000
--- a/theme/default/icon_heart-02.gif
+++ /dev/null
diff --git a/theme/default/icon_tag-01.gif b/theme/default/icon_tag-01.gif
deleted file mode 100644
index 92e5742ce..000000000
--- a/theme/default/icon_tag-01.gif
+++ /dev/null
diff --git a/theme/default/ie6.css b/theme/default/ie6.css
deleted file mode 100644
index f9fc8150e..000000000
--- a/theme/default/ie6.css
+++ /dev/null
@@ -1,73 +0,0 @@
-@charset "UTF-8";
-/* CSS Document */
-body {
-	text-align: center;
-}
-input {
-	height: 24px;
-}
-#wrap {
-	margin: 0 auto;
-	padding: 0 20px;
-	width: 800px;
-	text-align: left;
-	background: url(bg-header.gif) repeat-x #fbf2d7;
-	}
-#header {
-	position: relative;
-	margin-left: 108px;
-	}	
-#nav_views {
-	margin: 0;
-	}
-#nav_views li {
-	line-height: 19px;
-	}
-.statistics dd {
-	margin-top: -15px;
-	clear: both;
-	}	
-#notices {
-	margin: 0;
-	}			
-.notice_single {
-	height: 48px;
-	}
-#profile {
-  margin-left:0px;
-}	
-#profile p.notice_current {
-	height: 96px;
-	}	
-#filter_tags {
-  margin-left:20px;
-}	
-#content .subscriptions {
-  margin-left:30px;
-  width:100%;
-}
-
-#subscriptions_avatars li {
-	float: left;
-	margin: 0;
-	padding: 0;
-	}
-img.avatar.original, img.avatar.profile {
-	clear: none;
-	float: left;
-}		
-#status_textarea {
-	height: 46px;
-	}
-			
-#nav_pagination li a {
-	padding: 6px 15px;
-	line-height: 27px;
-	}
-#nav_sub {
-	position: relative;
-	margin-left: 108px;
-	}	
-#footer {
-	margin-left: 108px;
-}
diff --git a/theme/default/ie7.css b/theme/default/ie7.css
deleted file mode 100644
index 23a3241b7..000000000
--- a/theme/default/ie7.css
+++ /dev/null
@@ -1,39 +0,0 @@
-@charset "UTF-8";
-/* CSS Document */
-input.disfavor,
-input.favor {
-	text-indent:0;
-	text-align:right;
-	padding-left:25px;
-}
-
-#profile_actions li {
-float:left;
-clear:both;
-}
-#profile_actions #profile_nudge input.submit {
-margin-left:0;
-width:100px;
-}
-
-#statistics dd {
-	clear: both;
-	}		
-	
-#subscriptions_avatars li {
-	float: left;
-	}
-img.avatar.original, img.avatar.profile {
-	clear: none;
-	float: left;
-}
-			
-#nav_pagination li a {
-	padding: 6px 15px;
-	line-height: 27px;
-	}
-
-#filter_tags ul li#filter_tags_item label {
-position:relative;
-top:-8px;
-}
\ No newline at end of file
diff --git a/theme/default/login-bg.gif b/theme/default/login-bg.gif
deleted file mode 100644
index e2d8377db..000000000
--- a/theme/default/login-bg.gif
+++ /dev/null
diff --git a/theme/identica/bg-body.gif b/theme/identica/bg-body.gif
deleted file mode 100644
index d87e2e8d7..000000000
--- a/theme/identica/bg-body.gif
+++ /dev/null
diff --git a/theme/identica/bg-header.gif b/theme/identica/bg-header.gif
deleted file mode 100644
index 5154b2e5e..000000000
--- a/theme/identica/bg-header.gif
+++ /dev/null
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 19beb1f90..576a2e14b 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -10,7 +10,7 @@
 html,
 body,
 a:active {
-background-color:#ddd;
+background-color:#F0F2F5;
 }
 body {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
@@ -34,18 +34,21 @@ border-color:#aaa;
 border-color:#ddd;
 }
 
+.form_settings input.form_action-secondary {
+background:none;
+}
 
 input.submit,
 #form_notice.warning #notice_text-count,
 #nav_register a,
 .form_settings .form_note,
 .entity_remote_subscribe {
-background-color:#A9BF4F;
+background-color:#9BB43E;
 }
 
 input:focus, textarea:focus, select:focus,
 #form_notice.warning #notice_data-text {
-border-color:#A9BF4F;
+border-color:#9BB43E;
 }
 input.submit,
 #nav_register a,
@@ -59,17 +62,17 @@ div.notice-options input,
 .form_user_unblock input.submit,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
-.entity_nudge p {
+.entity_nudge p,
+.form_settings input.form_action-secondary {
 color:#002E6E;
 }
 
 .notice,
 .profile {
-border-top-color:#D1D9E4;
+border-top-color:#CEE1E9;
 }
-.section .notice,
 .section .profile {
-border-top-color:#97BFD1;
+border-top-color:#87B4C8;
 }
 
 
@@ -92,12 +95,6 @@ color:#333;
 color:#000;
 }
 
-#form_notice #notice_data-attach_view {
-background-image:url(../images/icons/twotone/green/paper-clip.gif);
-background-repeat:no-repeat;
-background-position:0 45%;
-background-color:transparent;
-}
 
 #nav_register a {
 text-decoration:none;
@@ -106,7 +103,8 @@ padding:2px 4px;
 }
 
 #content,
-#site_nav_local_views a {
+#site_nav_local_views a,
+#aside_primary {
 border-color:#fff;
 }
 #content,
@@ -115,15 +113,13 @@ background-color:#fff;
 }
 
 #site_nav_local_views a {
-background-color:rgba(255, 255, 255, 0.2);
+background-color:rgba(135, 180, 200, 0.3);
 }
 #site_nav_local_views a:hover {
 background-color:rgba(255, 255, 255, 0.7);
 }
 
 
-
-
 #page_notice .error {
 background-color:#F7E8E8;
 }
@@ -133,36 +129,31 @@ background-color:#EFF3DC;
 
 
 #anon_notice {
-background-color:#97BFD1;
+background-color:#87B4C8;
 color:#fff;
 border-color:#fff;
 }
 
 #showstream #anon_notice {
-background-color:#A9BF4F;
+background-color:#9BB43E;
 }
 
 
-
-
 #export_data li a {
 background-repeat:no-repeat;
 background-position:0 45%;
 }
 #export_data li a.rss {
-background-image:url(../../base/images/icons/icon_rss.jpg);
+background-image:url(../../base/images/icons/icon_rss.png);
 }
 #export_data li a.atom {
-background-image:url(../../base/images/icons/icon_atom.jpg);
+background-image:url(../../base/images/icons/icon_atom.png);
 }
 #export_data li a.foaf {
 background-image:url(../../base/images/icons/icon_foaf.gif);
 }
-#export_data li a.export_vcard {
-background-image:url(../../base/images/icons/icon_vcard.gif);
-}
-
 
+.entity_edit a,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
 .form_user_block input.submit,
@@ -176,14 +167,17 @@ background-color:transparent;
 .form_group_leave input.submit
 .form_user_subscribe input.submit,
 .form_user_unsubscribe input.submit {
-background-color:#A9BF4F;
+background-color:#9BB43E;
 color:#fff;
 }
 .form_user_unsubscribe input.submit,
 .form_group_leave input.submit {
-background-color:#97BFD1;
+background-color:#87B4C8;
 }
 
+.entity_edit a {
+background-image:url(../images/icons/twotone/green/edit.gif);
+}
 .entity_send-a-message a {
 background-image:url(../images/icons/twotone/green/quote.gif);
 }
@@ -203,30 +197,6 @@ background-image:url(../images/icons/twotone/green/shield.gif);
 background-color:#fcfcfc;
 }
 
-.notice-data a span {
-background-color:transparent;
-background-repeat:no-repeat;
-background-position:0 45%;
-}
-.notice_video .notice-data a span {
-background-image:url(../images/icons/twotone/green/camera.gif);
-}
-.notice_audio .notice-data a span {
-background-image:url(../images/icons/twotone/green/music.gif);
-}
-.notice_image .notice-data a span {
-background-image:url(../images/icons/twotone/green/search.gif);
-}
-.notice_event .notice-data a span {
-background-image:url(../images/icons/twotone/green/calendar.gif);
-}
-.notice_location .notice-data a span {
-background-image:url(../images/icons/twotone/green/flag.gif);
-}
-.notice_document .notice-data a span {
-background-image:url(../images/icons/twotone/green/document.gif);
-}
-
 .notice-options .notice_reply a,
 .notice-options form input.submit {
 background-color:transparent;
@@ -268,17 +238,21 @@ background-color:#fcfcfc;
 #new_group a {
 background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
 }
-
+#usergroups #new_group {
+float: left;
+margin-right: 2em;
+}
 
 .pagination .nav_prev a,
 .pagination .nav_next a {
 background-repeat:no-repeat;
+border-color:#CEE1E9;
 }
 .pagination .nav_prev a {
 background-image:url(../images/icons/twotone/green/arrow-left.gif);
-background-position:0 45%;
+background-position:10% 45%;
 }
 .pagination .nav_next a {
 background-image:url(../images/icons/twotone/green/arrow-right.gif);
-background-position:100% 45%;
+background-position:90% 45%;
 }
diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
new file mode 100644
index 000000000..2f463bb44
--- /dev/null
+++ b/theme/identica/css/ie.css
@@ -0,0 +1,9 @@
+/* IE specific styles */
+
+.notice-options input.submit {
+color:#fff;
+}
+
+#site_nav_local_views a {
+background-color:#D0DFE7;
+}
diff --git a/theme/identica/display.css b/theme/identica/display.css
deleted file mode 100644
index 62d34f00e..000000000
--- a/theme/identica/display.css
+++ /dev/null
@@ -1,187 +0,0 @@
-/* CSS Document */
-/* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */
-
-@import url(../default/display.css);
-
-html {
-     background: url(bg-body.gif) repeat-y top center #d8e2d7;
-}
-
-body {
-     color: #193441;
-}
-
-a {
-     color: #C15D42;
-}
-
-#wrap {
-      background: url(bg-header.gif) repeat-x #FCFFF5;
-}
-
-#header h1.pagetitle {
-	color: #d8e2d7;
-}
-
-#header h2.sitename {
-	color: #FCFFF5;
-}
-
-#nav li a {
-     color: #91AA9D;
-}
-
-#nav_views li a {
-     color: #FCFFF5;
-     background-color: #91AA9D;
-     border-right: 1px solid #6A8787;
-}
-
-#nav_views li.current a, #nav_views li.current a:hover {
-     color: #3F606F;
-     background-color: #FCFFF5;
-     border-right: 1px solid #6A8787;
-}
-
-#nav_views li.current a:hover {
-     color: #193441;
-}
-
-#nav_views li a:hover {
-     color: #FCFFF5;
-     background-color: #3F606F;
-     border-right: 1px solid #6A8787;
-     }
-
-#nav_sub {
-     border-top: 1px solid #D8E2D7;
-     }
-
-.instructions p, .success, .error {
-     border: 1px solid #91AA9D;
-     color: #FCFFF5;
-     }
-.instructions a:hover, .success a:hover, .error a:hover {
-     color: #FCFFF5;
-     }
-
-#notices {
-     border-top: 1px solid #D8E2D7;
-     }
-
-.notice_single {
-     border-bottom: 1px solid #D8E2D7;
-}
-
-.notice_single:hover {
-     background-color: #F3F8EA;
-     }
-
-input#submit_yes, input#submit_no {
-     color: #FCFFF5;
-     background-color: #C15D42;
-     }
-
-input#submit_yes:hover, input#submit_no:hover {
-     background-color: #904632;
-     }
-
-p.time a {
-    color: #91AA9D;
-    }
-
-#profile {
-    border-top: 1px solid #D8E2D7;
-    }
-
-#profile h2 {
-    color: #91AA9D;
-    }
-
-#nav_pagination li {
-    background-color: #91AA9D;
-    }
-
-#nav_pagination li a {
-    background-color: #91AA9D;
-    color: #FCFFF5;
-    }
-
-#nav_pagination li a:hover {
-    color: #FCFFF5;
-    }
-
-#footer {
-    border-top: 1px solid #D8E2D7;
-    }
-
-form input {
-     border: 1px solid #D8E2D7;
-     }
-
-input#submit, input.submit  {
-    color: #FCFFF5;
-    background-color: #C15D42;
-    }
-
-input#submit:hover, input.submit:hover {
-    background-color: #904632;
-    }
-
-textarea, input {
-    color: #193441;
-    }
-
-textarea:focus, input:focus {
-    background-color: #f0f6eb;
-    }
-
-.input_instructions {
-    color: #91aa9d;
-    }
-
-#status_label {
-    color: #91AA9D;
-    }
-
-#status_textarea {
-    color: #193441;
-}
-
-#status_submit {
-    background-color: #C15D42;
-    color: #FCFFF5;
-    }
-
-#status_submit:hover {
-    background-color: #904632;
-    }
-
-#content .subscribe .submit, #content .unsubscribe .submit, #remotesubscribe .button, #remotesubscribe {
-    background-color: #c15d42;
-    color: #fcfff5;
-    }
-
-#profiles {
-    border-top: 1px solid #D8E2D7;
-    }
-
-.profile_single {
-    border-bottom: 1px solid #D8E2D7;
-    }
-
-.profile_single:hover {
-    background-color: #F3F8EA;
-    }
-
-#messages {
-    border-top: 1px solid #D8E2D7;
-    }
-
-.message_single {
-    border-bottom: 1px solid #D8E2D7;
-    }
-
-.message_single:hover {
-    background-color: #F3F8EA;
-    }
diff --git a/theme/identica/ie6.css b/theme/identica/ie6.css
deleted file mode 100644
index a301f1dc5..000000000
--- a/theme/identica/ie6.css
+++ /dev/null
@@ -1,14 +0,0 @@
-@charset "UTF-8";
-/* CSS Document */
-@import url(../default/ie6.css);
-#wrap {
-	background: url(bg-header.gif) repeat-x #FCFFF5;
-	}
-
-
-input.disfavor,
-input.favor {
-	text-indent:0px;
-	text-align:right;
-	padding-left:25px;
-}
\ No newline at end of file
diff --git a/theme/identica/ie7.css b/theme/identica/ie7.css
deleted file mode 100644
index cab6f4059..000000000
--- a/theme/identica/ie7.css
+++ /dev/null
@@ -1,3 +0,0 @@
-@charset "UTF-8";
-/* CSS Document */
-@import url(../default/ie7.css);
diff --git a/theme/identica/login-bg.gif b/theme/identica/login-bg.gif
deleted file mode 100644
index e2d8377db..000000000
--- a/theme/identica/login-bg.gif
+++ /dev/null
diff --git a/theme/identica/logo.png b/theme/identica/logo.png
index cee36799e..7c68b34f6 100644
--- a/theme/identica/logo.png
+++ b/theme/identica/logo.png
diff --git a/theme/readme.txt b/theme/readme.txt
new file mode 100644
index 000000000..4998b3c98
--- /dev/null
+++ b/theme/readme.txt
@@ -0,0 +1,36 @@
+/** Howto: create a laconica theme
+ *
+ * @package   Laconica
+ * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+Location of key paths and files under theme/:
+
+./base/css/
+./base/css/display.css
+./base/images/
+
+./default/css/
+./default/css/display.css
+./default/images/
+
+./base/display.css contains layout, typography rules:
+Only alter this file if you want to change the layout of the site. Please note that, any updates to this in future laconica releases may not be compatible with your version.
+
+./default/css/display.css contains only the background images and colour rules:
+This file is a good basis for creating your own theme.
+
+
+1. Copy over the default theme to start off (replace 'mytheme'):
+cp -r ./default ./mytheme
+
+2. Edit your mytheme stylesheet:
+nano ./mytheme/css/display.css
+
+3. Search and replace a colour or a path to the background image of your choice.
+
+4. Set /config.php to load 'mytheme':
+$config['site']['theme'] = 'mytheme';